From 6f971304976fa173292f6b887f00c4e594833e16 Mon Sep 17 00:00:00 2001 From: Robert Prehn <3952444+prehnRA@users.noreply.github.com> Date: Thu, 25 Mar 2021 23:34:26 -0500 Subject: [PATCH] feat: Use buildx to time docker builds --- .gitlab-ci.yml | 2 +- Dockerfile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 12cf022c..d16faf12 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,7 @@ build_image_for_commit: script: - docker login "https://${CI_REGISTRY}" -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD - docker pull $CI_REGISTRY_IMAGE:latest || true - - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA . + - docker buildx build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA . - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA deploy_to_tags: diff --git a/Dockerfile b/Dockerfile index 4822508a..ae9a1f47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,6 +35,7 @@ RUN MAKE=cmake mix compile FROM node:15.0 WORKDIR /root/app/apps/app/assets/ +ADD ./apps/app/assets/node_modules /root/app/apps/assets/node_modules COPY --from=0 /root/app/ /root/app/ RUN npm install RUN npm run deploy