diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34e75b1a769a7503bd0822e5d12d6312eca92d82..0e297dbc296240ec06c0a5bd78141c5e5345ca3d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,21 +19,21 @@ build demo: before_script: - echo "$CI_REGISTRY_PASSWORD" | docker login "$CI_REGISTRY" -u "$CI_REGISTRY_USER" --password-stdin script: - - docker pull $IMAGE_NAME_DEMO:latest || true + # - docker pull $IMAGE_NAME_DEMO:latest || true - docker build - --cache-from $IMAGE_NAME_DEMO:latest + # --cache-from $IMAGE_NAME_DEMO:latest --tag $IMAGE_NAME_DEMO:$CI_COMMIT_SHA - --tag $IMAGE_NAME_DEMO:latest + # --tag $IMAGE_NAME_DEMO:latest -f $BUILD_PATH/Dockerfile-production $BUILD_PATH - docker push $IMAGE_NAME_DEMO:$CI_COMMIT_SHA - - docker push $IMAGE_NAME_DEMO:latest + # - docker push $IMAGE_NAME_DEMO:latest only: - master pages: stage: Deploy - image: $IMAGE_NAME_DEPLOY + image: $IMAGE_NAME_DEPLOY:$CI_COMMIT_SHA script: - mv _build public artifacts: diff --git a/Dockerfile-production b/Dockerfile-production index 1df93434a866682f8682ffcb325a09ba25c6d9d3..0ff94e13f5b744e504b13ab54df748d13dcae53c 100644 --- a/Dockerfile-production +++ b/Dockerfile-production @@ -3,8 +3,8 @@ FROM node:16-bullseye-slim -RUN apt-get update && \ - apt-get upgrade -y +# RUN apt-get update && \ +# apt-get upgrade -y WORKDIR /home/wax ENV NODE_ENV=production @@ -27,10 +27,10 @@ RUN cd editors/demo && yarn react-app-rewired build ###### # RUN -FROM node:16-bullseye +FROM node:16-bullseye-slim -RUN apt-get update && \ - apt-get upgrade -y +# RUN apt-get update && \ +# apt-get upgrade -y RUN npm install --global serve