From 6ee125d843476be41f742095c7a3195dbc5bb4c8 Mon Sep 17 00:00:00 2001 From: derrabauke <pfralf@googlemail.com> Date: Sat, 13 Mar 2021 01:10:59 +0100 Subject: [PATCH] finally fix docker build --- .gitlab-ci.yml | 3 +-- app/client/Dockerfile | 8 ++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6cc94b3..e7ea2f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,10 +50,9 @@ build_client: image: docker:19.03.12 tags: - docker-privileged - services: - - docker:19.03.12-dind stage: build script: + - cd app/client - 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 diff --git a/app/client/Dockerfile b/app/client/Dockerfile index 0e6e782..8cb3e5c 100644 --- a/app/client/Dockerfile +++ b/app/client/Dockerfile @@ -3,11 +3,15 @@ FROM node:12.16.3 as build RUN mkdir /usr/src/app WORKDIR /usr/src/app -COPY . ./ + +COPY package*.json ./ + ENV PATH /usr/src/app/node_modules/.bin:$PATH -RUN ls -a + RUN npm install --silent +COPY . . + RUN npm run build # Put this stuff into a nginx server -- GitLab