Update .gitlab-ci.yml

- Add common/subtags/root.Dockerfile

Update .gitlab-ci.yml
d7b4d56c · Olivier Benz · 6552deda · d7b4d56c · d7b4d56c · d7b4d56c
Verified Commit d7b4d56c authored 2 years ago by Olivier Benz
--- a/base/.gitlab-ci.yml
+++ b/base/.gitlab-ci.yml
@@ -37,6 +37,10 @@
  before_script:
    - *before-script-build

+.post:
+  image: registry.gitlab.b-data.ch/docker/docker-buildx:latest
+  stage: .post
+
 build:latest-linux-amd64:
  extends: .build
  tags:
@@ -50,12 +54,12 @@ build:latest-linux-amd64:
      -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-linux-amd64
      -f latest.Dockerfile .
-    - |
-      docker build -t $CI_APP_REPO:$CI_APP_TAG-root-linux-amd64 \
-      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-root-linux-amd64 -<<EOF
-      FROM $CI_APP_REPO:$CI_APP_TAG-linux-amd64
-      USER root
-      EOF
+    - >
+      docker build
+      --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG-linux-amd64
+      -t $CI_APP_REPO:$CI_APP_TAG-root-linux-amd64
+      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-root-linux-amd64
+      -f ../common/subtags/root.Dockerfile .
    - docker push -a $CI_APP_REPO
  rules:
    - if: $CI_COMMIT_BRANCH == "main" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
@@ -75,12 +79,12 @@ build:latest-linux-arm64v8:
      -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-linux-arm64v8
      -f latest.Dockerfile .
-    - |
-      docker build -t $CI_APP_REPO:$CI_APP_TAG-root-linux-arm64v8 \
-      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-root-linux-arm64v8 -<<EOF
-      FROM $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
-      USER root
-      EOF
+    - >
+      docker build
+      --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
+      -t $CI_APP_REPO:$CI_APP_TAG-root-linux-arm64v8
+      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-root-linux-arm64v8
+      -f ../common/subtags/root.Dockerfile .
    - docker push -a $CI_APP_REPO
  rules:
    - if: $CI_COMMIT_BRANCH == "main" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
@@ -98,11 +102,11 @@ build:version-linux-amd64:
      --build-arg NCPUS=$((`nproc`/2+1))
      -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
      -f $R_VERSION.Dockerfile .
-    - |
-      docker build -t $CI_APP_REPO:$CI_APP_TAG-root-linux-amd64 -<<EOF
-      FROM $CI_APP_REPO:$CI_APP_TAG-linux-amd64
-      USER root
-      EOF
+    - >
+      docker build
+      --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG-linux-amd64
+      -t $CI_APP_REPO:$CI_APP_TAG-root-linux-amd64
+      -f ../common/subtags/root.Dockerfile .
    - docker push -a $CI_APP_REPO
  rules:
    - if: $CI_COMMIT_BRANCH == "freeze-version" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
@@ -120,11 +124,11 @@ build:version-linux-arm64v8:
      --build-arg NCPUS=$((`nproc`/2+1))
      -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
      -f $R_VERSION.Dockerfile .
-    - |
-      docker build -t $CI_APP_REPO:$CI_APP_TAG-root-linux-arm64v8 -<<EOF
-      FROM $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
-      USER root
-      EOF
+    - >
+      docker build
+      --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
+      -t $CI_APP_REPO:$CI_APP_TAG-root-linux-arm64v8
+      -f ../common/subtags/root.Dockerfile .
    - docker push -a $CI_APP_REPO
  rules:
    - if: $CI_COMMIT_BRANCH == "freeze-version" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
@@ -134,6 +138,7 @@ build:version-linux-arm64v8:
 build-manifest:latest-linux-multiarch:
  extends: .build
  stage: deploy
+  needs: ["build:latest-linux-amd64", "build:latest-linux-arm64v8"]
  script:
    - |
      for i in $OS_ARCH; do
@@ -192,6 +197,7 @@ build-manifest:latest-linux-multiarch:
 build-manifest:version-linux-multiarch:
  extends: .build
  stage: deploy
+  needs: ["build:version-linux-amd64", "build:version-linux-arm64v8"]
  script:
    - |
      for i in $OS_ARCH; do
@@ -215,8 +221,9 @@ build-manifest:version-linux-multiarch:
        - base/$R_VERSION.Dockerfile

 trigger-latest-build:
-  extends: .build
+  extends: .post
  stage: .post
+  needs: ["build-manifest:latest-linux-multiarch"]
  before_script:
    - apk upgrade --no-cache
    - apk add --update --no-cache curl
@@ -228,8 +235,9 @@ trigger-latest-build:
        - base/latest.Dockerfile

 trigger-version-build:
-  extends: .build
+  extends: .post
  stage: .post
+  needs: ["build-manifest:version-linux-multiarch"]
  before_script:
    - apk upgrade --no-cache
    - apk add --update --no-cache curl

--- a/common/subtags/root.Dockerfile
+++ b/common/subtags/root.Dockerfile
+ARG BUILD_ON_IMAGE
+
+FROM ${BUILD_ON_IMAGE}
+
+USER root
--- a/geospatial/.gitlab-ci.yml
+++ b/geospatial/.gitlab-ci.yml
@@ -38,6 +38,10 @@
  before_script:
    - *before-script-build

+.post:
+  image: registry.gitlab.b-data.ch/docker/docker-buildx:latest
+  stage: .post
+
 build:latest-linux-amd64:
  extends: .build
  tags:
@@ -51,12 +55,12 @@ build:latest-linux-amd64:
      -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-linux-amd64
      -f geospatial/latest.Dockerfile .
-    - |
-      docker build -t $CI_APP_REPO:$CI_APP_TAG-root-linux-amd64 \
-      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-root-linux-amd64 -<<EOF
-      FROM $CI_APP_REPO:$CI_APP_TAG-linux-amd64
-      USER root
-      EOF
+    - >
+      docker build
+      --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG-linux-amd64
+      -t $CI_APP_REPO:$CI_APP_TAG-root-linux-amd64
+      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-root-linux-amd64
+      -f common/subtags/root.Dockerfile .
    - docker push -a $CI_APP_REPO
  rules:
    - if: $CI_COMMIT_BRANCH == "main" && $UPDATE_MODE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
@@ -76,12 +80,12 @@ build:latest-linux-arm64v8:
      -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-linux-arm64v8
      -f geospatial/latest.Dockerfile .
-    - |
-      docker build -t $CI_APP_REPO:$CI_APP_TAG-root-linux-arm64v8 \
-      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-root-linux-arm64v8 -<<EOF
-      FROM $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
-      USER root
-      EOF
+    - >
+      docker build
+      --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
+      -t $CI_APP_REPO:$CI_APP_TAG-root-linux-arm64v8
+      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-root-linux-arm64v8
+      -f common/subtags/root.Dockerfile .
    - docker push -a $CI_APP_REPO
  rules:
    - if: $CI_COMMIT_BRANCH == "main" && $UPDATE_MODE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
@@ -99,11 +103,11 @@ build:version-linux-amd64:
      --build-arg NCPUS=$((`nproc`/2+1))
      -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
      -f geospatial/$R_VERSION.Dockerfile .
-    - |
-      docker build -t $CI_APP_REPO:$CI_APP_TAG-root-linux-amd64 -<<EOF
-      FROM $CI_APP_REPO:$CI_APP_TAG-linux-amd64
-      USER root
-      EOF
+    - >
+      docker build
+      --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG-linux-amd64
+      -t $CI_APP_REPO:$CI_APP_TAG-root-linux-amd64
+      -f common/subtags/root.Dockerfile .
    - docker push -a $CI_APP_REPO
  rules:
    - if: $CI_COMMIT_BRANCH == "freeze-version" && $CI_PIPELINE_TRIGGERED && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
@@ -121,11 +125,11 @@ build:version-linux-arm64v8:
      --build-arg NCPUS=$((`nproc`/2+1))
      -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
      -f geospatial/$R_VERSION.Dockerfile .
-    - |
-      docker build -t $CI_APP_REPO:$CI_APP_TAG-root-linux-arm64v8 -<<EOF
-      FROM $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
-      USER root
-      EOF
+    - >
+      docker build
+      --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
+      -t $CI_APP_REPO:$CI_APP_TAG-root-linux-arm64v8
+      -f common/subtags/root.Dockerfile .
    - docker push -a $CI_APP_REPO
  rules:
    - if: $CI_COMMIT_BRANCH == "freeze-version" && $CI_PIPELINE_TRIGGERED && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
@@ -135,6 +139,7 @@ build:version-linux-arm64v8:
 build-manifest:latest-linux-multiarch:
  extends: .build
  stage: deploy
+  needs: ["build:latest-linux-amd64", "build:latest-linux-arm64v8"]
  script:
    - |
      for i in $OS_ARCH; do
@@ -193,6 +198,7 @@ build-manifest:latest-linux-multiarch:
 build-manifest:version-linux-multiarch:
  extends: .build
  stage: deploy
+  needs: ["build:version-linux-amd64", "build:version-linux-arm64v8"]
  script:
    - |
      for i in $OS_ARCH; do

--- a/tidyverse/.gitlab-ci.yml
+++ b/tidyverse/.gitlab-ci.yml
@@ -38,6 +38,10 @@
  before_script:
    - *before-script-build

+.post:
+  image: registry.gitlab.b-data.ch/docker/docker-buildx:latest
+  stage: .post
+
 build:latest-linux-amd64:
  extends: .build
  tags:
@@ -51,12 +55,12 @@ build:latest-linux-amd64:
      -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-linux-amd64
      -f tidyverse/latest.Dockerfile .
-    - |
-      docker build -t $CI_APP_REPO:$CI_APP_TAG-root-linux-amd64 \
-      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-root-linux-amd64 -<<EOF
-      FROM $CI_APP_REPO:$CI_APP_TAG-linux-amd64
-      USER root
-      EOF
+    - >
+      docker build
+      --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG-linux-amd64
+      -t $CI_APP_REPO:$CI_APP_TAG-root-linux-amd64
+      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-root-linux-amd64
+      -f common/subtags/root.Dockerfile .
    - docker push -a $CI_APP_REPO
  rules:
    - if: $CI_COMMIT_BRANCH == "main" && $UPDATE_MODE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
@@ -76,12 +80,12 @@ build:latest-linux-arm64v8:
      -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-linux-arm64v8
      -f tidyverse/latest.Dockerfile .
-    - |
-      docker build -t $CI_APP_REPO:$CI_APP_TAG-root-linux-arm64v8 \
-      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-root-linux-arm64v8 -<<EOF
-      FROM $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
-      USER root
-      EOF
+    - >
+      docker build
+      --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
+      -t $CI_APP_REPO:$CI_APP_TAG-root-linux-arm64v8
+      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-root-linux-arm64v8
+      -f common/subtags/root.Dockerfile .
    - docker push -a $CI_APP_REPO
  rules:
    - if: $CI_COMMIT_BRANCH == "main" && $UPDATE_MODE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
@@ -99,11 +103,11 @@ build:version-linux-amd64:
      --build-arg NCPUS=$((`nproc`/2+1))
      -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
      -f tidyverse/$R_VERSION.Dockerfile .
-    - |
-      docker build -t $CI_APP_REPO:$CI_APP_TAG-root-linux-amd64 -<<EOF
-      FROM $CI_APP_REPO:$CI_APP_TAG-linux-amd64
-      USER root
-      EOF
+    - >
+      docker build
+      --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG-linux-amd64
+      -t $CI_APP_REPO:$CI_APP_TAG-root-linux-amd64
+      -f common/subtags/root.Dockerfile .
    - docker push -a $CI_APP_REPO
  rules:
    - if: $CI_COMMIT_BRANCH == "freeze-version" && $CI_PIPELINE_TRIGGERED && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
@@ -121,11 +125,11 @@ build:version-linux-arm64v8:
      --build-arg NCPUS=$((`nproc`/2+1))
      -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
      -f tidyverse/$R_VERSION.Dockerfile .
-    - |
-      docker build -t $CI_APP_REPO:$CI_APP_TAG-root-linux-arm64v8 -<<EOF
-      FROM $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
-      USER root
-      EOF
+    - >
+      docker build
+      --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
+      -t $CI_APP_REPO:$CI_APP_TAG-root-linux-arm64v8
+      -f common/subtags/root.Dockerfile .
    - docker push -a $CI_APP_REPO
  rules:
    - if: $CI_COMMIT_BRANCH == "freeze-version" && $CI_PIPELINE_TRIGGERED && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
@@ -135,6 +139,7 @@ build:version-linux-arm64v8:
 build-manifest:latest-linux-multiarch:
  extends: .build
  stage: deploy
+  needs: ["build:latest-linux-amd64", "build:latest-linux-arm64v8"]
  script:
    - |
      for i in $OS_ARCH; do
@@ -193,6 +198,7 @@ build-manifest:latest-linux-multiarch:
 build-manifest:version-linux-multiarch:
  extends: .build
  stage: deploy
+  needs: ["build:version-linux-amd64", "build:version-linux-arm64v8"]
  script:
    - |
      for i in $OS_ARCH; do
@@ -216,8 +222,9 @@ build-manifest:version-linux-multiarch:
        - tidyverse/$R_VERSION.Dockerfile

 trigger-latest-build:
-  extends: .build
+  extends: .post
  stage: .post
+  needs: ["build-manifest:latest-linux-multiarch"]
  before_script:
    - apk upgrade --no-cache
    - apk add --update --no-cache curl
@@ -229,8 +236,9 @@ trigger-latest-build:
        - tidyverse/latest.Dockerfile

 trigger-version-build:
-  extends: .build
+  extends: .post
  stage: .post
+  needs: ["build-manifest:version-linux-multiarch"]
  before_script:
    - apk upgrade --no-cache
    - apk add --update --no-cache curl

--- a/verse/.gitlab-ci.yml
+++ b/verse/.gitlab-ci.yml
@@ -38,6 +38,10 @@
  before_script:
    - *before-script-build

+.post:
+  image: registry.gitlab.b-data.ch/docker/docker-buildx:latest
+  stage: .post
+
 build:latest-linux-amd64:
  extends: .build
  tags:
@@ -51,12 +55,12 @@ build:latest-linux-amd64:
      -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-linux-amd64
      -f verse/latest.Dockerfile .
-    - |
-      docker build -t $CI_APP_REPO:$CI_APP_TAG-root-linux-amd64 \
-      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-root-linux-amd64 -<<EOF
-      FROM $CI_APP_REPO:$CI_APP_TAG-linux-amd64
-      USER root
-      EOF
+    - >
+      docker build
+      --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG-linux-amd64
+      -t $CI_APP_REPO:$CI_APP_TAG-root-linux-amd64
+      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-root-linux-amd64
+      -f common/subtags/root.Dockerfile .
    - docker push -a $CI_APP_REPO
  rules:
    - if: $CI_COMMIT_BRANCH == "main" && $UPDATE_MODE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
@@ -76,12 +80,12 @@ build:latest-linux-arm64v8:
      -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-linux-arm64v8
      -f verse/latest.Dockerfile .
-    - |
-      docker build -t $CI_APP_REPO:$CI_APP_TAG-root-linux-arm64v8 \
-      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-root-linux-arm64v8 -<<EOF
-      FROM $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
-      USER root
-      EOF
+    - >
+      docker build
+      --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
+      -t $CI_APP_REPO:$CI_APP_TAG-root-linux-arm64v8
+      -t $CI_APP_REPO:$VERSION_MAJ_MIN_PAT-root-linux-arm64v8
+      -f common/subtags/root.Dockerfile .
    - docker push -a $CI_APP_REPO
  rules:
    - if: $CI_COMMIT_BRANCH == "main" && $UPDATE_MODE != "true" && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
@@ -99,11 +103,11 @@ build:version-linux-amd64:
      --build-arg NCPUS=$((`nproc`/2+1))
      -t $CI_APP_REPO:$CI_APP_TAG-linux-amd64
      -f verse/$R_VERSION.Dockerfile .
-    - |
-      docker build -t $CI_APP_REPO:$CI_APP_TAG-root-linux-amd64 -<<EOF
-      FROM $CI_APP_REPO:$CI_APP_TAG-linux-amd64
-      USER root
-      EOF
+    - >
+      docker build
+      --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG-linux-amd64
+      -t $CI_APP_REPO:$CI_APP_TAG-root-linux-amd64
+      -f common/subtags/root.Dockerfile .
    - docker push -a $CI_APP_REPO
  rules:
    - if: $CI_COMMIT_BRANCH == "freeze-version" && $CI_PIPELINE_TRIGGERED && $CI_BUILD_PLATFORMS =~ /(linux\/amd64)/
@@ -121,11 +125,11 @@ build:version-linux-arm64v8:
      --build-arg NCPUS=$((`nproc`/2+1))
      -t $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
      -f verse/$R_VERSION.Dockerfile .
-    - |
-      docker build -t $CI_APP_REPO:$CI_APP_TAG-root-linux-arm64v8 -<<EOF
-      FROM $CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
-      USER root
-      EOF
+    - >
+      docker build
+      --build-arg BUILD_ON_IMAGE=$CI_APP_REPO:$CI_APP_TAG-linux-arm64v8
+      -t $CI_APP_REPO:$CI_APP_TAG-root-linux-arm64v8
+      -f common/subtags/root.Dockerfile .
    - docker push -a $CI_APP_REPO
  rules:
    - if: $CI_COMMIT_BRANCH == "freeze-version" && $CI_PIPELINE_TRIGGERED && $CI_BUILD_PLATFORMS =~ /(linux\/arm64\/v8)/
@@ -135,6 +139,7 @@ build:version-linux-arm64v8:
 build-manifest:latest-linux-multiarch:
  extends: .build
  stage: deploy
+  needs: ["build:latest-linux-amd64", "build:latest-linux-arm64v8"]
  script:
    - |
      for i in $OS_ARCH; do
@@ -193,6 +198,7 @@ build-manifest:latest-linux-multiarch:
 build-manifest:version-linux-multiarch:
  extends: .build
  stage: deploy
+  needs: ["build:version-linux-amd64", "build:version-linux-arm64v8"]
  script:
    - |
      for i in $OS_ARCH; do
@@ -216,8 +222,9 @@ build-manifest:version-linux-multiarch:
        - verse/$R_VERSION.Dockerfile

 trigger-latest-build:
-  extends: .build
+  extends: .post
  stage: .post
+  needs: ["build-manifest:latest-linux-multiarch"]
  before_script:
    - apk upgrade --no-cache
    - apk add --update --no-cache curl
@@ -229,8 +236,9 @@ trigger-latest-build:
        - verse/latest.Dockerfile

 trigger-version-build:
-  extends: .build
+  extends: .post
  stage: .post
+  needs: ["build-manifest:version-linux-multiarch"]
  before_script:
    - apk upgrade --no-cache
    - apk add --update --no-cache curl