From 8c3f3194acdefa61d9621fd05cdf85dd8d50a0e6 Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Tue, 22 Jun 2021 18:33:35 +0200
Subject: [PATCH] [fix] FIx CI build

---
 .gitlab-ci.yml | 57 +++++++++++++++++++++++++++-----------------------
 Dockerfile     | 22 ++++++++++---------
 dist/desktop   |  2 +-
 3 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8c86075b..5af089b9e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,18 +24,9 @@ variables:
 # Jobs templates
 # ---------------------------------------------------------------
 
-
-# ---------------------------------------------------------------
-# Build jobs
-# ---------------------------------------------------------------
-
-fast-build:
+.build:
   stage: build
-  image: ${CONTAINER_BUILD_IMAGE}
-  before_script:
-    - mv /customCache/node_modules ./
-    - cp -rf /customCache/www ./
-    - cp -rf /customCache/hooks ./
+  tags: [ redshift ]
   script:
     - yarn run build:web
   after_script:
@@ -46,32 +37,46 @@ fast-build:
     paths:
       - dist/web
     expire_in: 60 minutes
+
+.docker:
+  image: docker:latest
+  tags: [ redshift ]
+  services:
+    - docker:dind
+  before_script:
+    - docker login -u gitlab-ci-token -p ${CI_BUILD_TOKEN} ${CI_REGISTRY} || true
+  allow_failure: false
+
+
+# ---------------------------------------------------------------
+# Build jobs
+# ---------------------------------------------------------------
+
+fast-build:
+  extends: .build
+  image: ${CONTAINER_BUILD_IMAGE}
+  before_script:
+    - mv /customCache/node_modules ./
+    - cp -rf /customCache/www ./
+    - cp -rf /customCache/hooks ./
   only:
     - develop
 
 failsafe-build:
+  extends: .build
   stage: alt_build
   when: on_failure
-  script:
+  before_script:
     - yarn
-    - yarn run build:web
-  artifacts:
-    untracked: true
-    paths:
-      - dist/web
-    expire_in: 60 minutes
   only:
     - develop
 
 docker-for-fast-build:
+  extends: .docker
   stage: alt_build
   when: on_failure
   allow_failure: true
-  tags: [doppler-docker]
-  image: docker:latest
-  services:
-    - docker:dind
-  script:
+  before_script:
     - echo 'FROM node:12' > Dockerfile
     - echo 'WORKDIR /customCache' >> Dockerfile
     - echo 'COPY ./ ./' >> Dockerfile
@@ -80,9 +85,9 @@ docker-for-fast-build:
     - echo 'RUN du -s `find . -maxdepth 1 | egrep -v "^\.$"`>/after.txt' >> Dockerfile
     - echo 'WORKDIR /build' >> Dockerfile
     - echo "RUN diff /before.txt /after.txt || true" >> Dockerfile
-    - docker login -u gitlab-ci-token -p "${CI_BUILD_TOKEN}" ${CI_REGISTRY}
-    - docker build --pull -t "${CONTAINER_BUILD_IMAGE}" .
-    - docker push "${CONTAINER_BUILD_IMAGE}"
+  script:
+    - docker build --pull -t ${CONTAINER_BUILD_IMAGE} .
+    - docker push ${CONTAINER_BUILD_IMAGE}
 
 # ---------------------------------------------------------------
 # Deploy jobs
diff --git a/Dockerfile b/Dockerfile
index f6dba3efd..e681ac5ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,18 @@
-FROM  node:10-alpine
+FROM  node:12
 LABEL maintainer="benoit [dot] lavenier [at] e-is [dot] pro"
-LABEL version="1.6.3"
+LABEL version="1.6.12"
 LABEL description="Cesium Wallet for Äž1 libre currency"
 
-ARG CESIUM_VER="1.6.3"
+ARG CESIUM_VER="1.6.12"
 
 ENV DEBIAN_FRONTEND=noninteractive \
-    NODE_VERSION=10.20.0 \
-    NPM_VERSION=6.14.4 \
-    YARN_VERSION=1.22.4 \
-    IONIC_CLI_VERSION=6.6.0 \
-    CORDOVA_VERSION=8.1.2 \
-    GRADLE_VERSION=4.10.3 \
-    GULP_VERSION=3.9.1
+    NODE_VERSION=12.21.0 \
+    NPM_VERSION=7.14.0 \
+    YARN_VERSION=1.22.10 \
+    IONIC_CLI_VERSION=6.16.3 \
+    CORDOVA_VERSION=10.0.0 \
+    GRADLE_VERSION=6.5.1 \
+    GULP_VERSION=4.0.2
 
 # Install basics
 RUN apk update && \
@@ -31,6 +31,8 @@ RUN yarn global add gulp@"$GULP_VERSION" @ionic/cli@"$IONIC_CLI_VERSION"
 # copy source tree
 COPY ./ ./
 
+RUN test -f package.json || git clone https://github.com/duniter/cesium.git && cd cesium
+
 # Install project dependencies
 # Workaround need for node-sass (- )see https://github.com/yarnpkg/yarn/issues/4867)
 RUN yarn install --ignore-engines && \
diff --git a/dist/desktop b/dist/desktop
index 62c8e26d1..6893ddeb3 160000
--- a/dist/desktop
+++ b/dist/desktop
@@ -1 +1 @@
-Subproject commit 62c8e26d1492b863d10b402669bf105a29353818
+Subproject commit 6893ddeb3aac99329524151029f44e4cf821502f
-- 
GitLab