From 7b8e855dc417083d51d929e2bfdba953be1a5e70 Mon Sep 17 00:00:00 2001 From: Timo Date: Tue, 4 May 2021 16:13:51 +0300 Subject: [PATCH] re-added normal build steps --- docker/red-ui/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/red-ui/Dockerfile b/docker/red-ui/Dockerfile index 58e70e801..28662709f 100644 --- a/docker/red-ui/Dockerfile +++ b/docker/red-ui/Dockerfile @@ -6,7 +6,7 @@ RUN apk add --update jq && rm -rf /var/cache/apk/* COPY package.json yarn.lock ./ ## Storing node modules on a separate layer will prevent unnecessary npm installs at each build -#//TODO RUN yarn install && mkdir /ng-app && mv ./node_modules ./ng-app +RUN yarn install && mkdir /ng-app && mv ./node_modules ./ng-app WORKDIR /ng-app @@ -23,8 +23,8 @@ COPY tsconfig.base.json tsconfig.base.json COPY versions.sh version.sh ## Build the angular app in production mode and store the artifacts in dist folder -#//TODO RUN yarn lint -#//TODO RUN yarn build --prod --project=red-ui --base-href /ui/ +RUN yarn lint +RUN yarn build --prod --project=red-ui --base-href /ui/ ### STAGE 2: Setup ### @@ -37,7 +37,7 @@ COPY docker/common/nginx/nginx.conf /etc/nginx/conf.d/default.conf RUN rm -rf /usr/share/nginx/html/* ## From ‘builder’ stage copy over the artifacts in dist folder to default nginx public folder -#//TODO COPY --from=builder /ng-app/dist/apps/red-ui /usr/share/nginx/html/ui +COPY --from=builder /ng-app/dist/apps/red-ui /usr/share/nginx/html/ui RUN chmod o+r -R /usr/share/nginx/html RUN chmod g+r -R /usr/share/nginx/html