diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e07d36f46ce608cf1986aedcc9f080b41e61925b..6cc94b38e6bb6873d2d2379a8baca317d18a4dc7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,7 +54,7 @@ build_client: - docker:19.03.12-dind stage: build script: - - docker build --network host -f app/client/Dockerfile -t $CLIENT_IMAGE_TAG . + - docker build -f app/client/Dockerfile -t $CLIENT_IMAGE_TAG . - docker tag $CLIENT_IMAGE_TAG $CLIENT_RELEASE_IMAGE_TAG - docker push $CLIENT_RELEASE_IMAGE_TAG only: diff --git a/app/client/Dockerfile b/app/client/Dockerfile index 882a681673a75fd094d228fead079fcf665adbf7..3c499ddf94e3e86e4ec0435d6bd2646cc35e2812 100644 --- a/app/client/Dockerfile +++ b/app/client/Dockerfile @@ -1,8 +1,10 @@ # Build a release -FROM node:12.16.3 +FROM node:12.16.3 as build RUN mkdir /usr/src/app +RUN ls WORKDIR /usr/src/app +RUN ls COPY package*.json ./ ENV PATH /usr/src/app/node_modules/.bin:$PATH @@ -15,7 +17,7 @@ RUN npm run build # Put this stuff into a nginx server FROM nginx:latest -COPY --from=0 /usr/src/app/build /usr/share/nginx/html +COPY --from=build /usr/src/app/build /usr/share/nginx/html EXPOSE 80