From 4b54fd859d91fca78bfc6106e4f01617c2670faa Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Thu, 24 Jun 2021 20:01:09 +0200
Subject: [PATCH] [fix] FIx CI build
---
.gitlab-ci.yml | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e075daaa0..d0afee4b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,7 +58,7 @@ build:
extends: .build
image: ${CI_BUILD_IMAGE}
before_script:
- - mv /.build-cache/node_modules ./
+ - mv /tmp/.build-cache/node_modules ./
- yarn run postinstall
only:
- develop
@@ -80,13 +80,19 @@ docker:ci:
script:
# Prepare the Dockerfile
- echo 'FROM node:12' > Dockerfile
- - echo 'WORKDIR /.build-cache' >> Dockerfile
- - echo 'RUN mkdir -p /.build-cache' >> Dockerfile
+ - echo 'WORKDIR /tmp/.build-cache' >> Dockerfile
- echo 'COPY ./ ./' >> Dockerfile
- - echo 'RUN du -s `find . -maxdepth 1 | egrep -v "^\.$"` > /.build-cache/install-before.txt' >> Dockerfile
- - echo 'RUN yarn' >> Dockerfile
- - echo 'RUN du -s `find . -maxdepth 1 | egrep -v "^\.$"` > /.build-cache/install-after.txt' >> Dockerfile
- - echo "RUN diff /.build-cache/install-before.txt /.build-cache/install-after.txt || true" >> Dockerfile
+ # Store disk usage (before install)
+ - echo 'RUN du -s `find /tmp/.cache/yarn -maxdepth 1 | egrep -v "^\.$"` > before.txt' >> Dockerfile
+ - echo 'RUN du -s `find node_modules -maxdepth 1 | egrep -v "^\.$"` >> before.txt' >> Dockerfile
+ # Install dependencies
+ - echo 'RUN npm install -g yarn @ionic/cli' >> Dockerfile
+ - echo 'RUN yarn install' >> Dockerfile
+ # Store disk usage (after install)
+ - echo 'RUN du -s `find /tmp/.cache/yarn -maxdepth 1 | egrep -v "^\.$"` > after.txt' >> Dockerfile
+ - echo 'RUN du -s `find node_modules -maxdepth 1 | egrep -v "^\.$"` >> after.txt' >> Dockerfile
+ # Force docker to detect any changes
+ - echo "RUN diff before.txt after.txt || true" >> Dockerfile
- echo 'WORKDIR /build' >> Dockerfile
# Build image
- docker build --no-cache -t ${CI_BUILD_IMAGE} .
--
GitLab