From d6a237fa1c6dc3e64e6367875e56014240ae3bba Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 2 Jan 2025 09:42:19 +0100
Subject: [PATCH] More buildkit tries

---
 .gitlab-ci.yml | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c87aef672..b4dc5774b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,17 @@
 variables:
   HOSTALIASES: "./hosts"
   DOCKER_HOST: "unix:///var/run/dind/docker.sock"
-  DOCKER_BUILDKIT: "1"
+  DOCKER_BUILDKIT: 1
+  DOCKER_VERSION: 27
   TESTCONTAINERS_RYUK_DISABLED: "false"
-  ALPINE_VERSION: "3.21"
-  PYTHON_VERSION: "3.11"
-  JAVA_VERSION: "17"
-  BUN_VERSION: "1.1.40"
-  DOC_VERSION: "1.6"
-  APP_VERSION: "1.6.0"
-  CHART_VERSION: "1.6.0"
+  ALPINE_VERSION: 3.21
+  PYTHON_VERSION: 3.11
+  JAVA_VERSION: 17
+  SONARQUBE_VERSION: 10.0
+  BUN_VERSION: 1.1.40
+  DOC_VERSION: 1.6
+  APP_VERSION: 1.6.0
+  CHART_VERSION: 1.6.0
   CACHE_FALLBACK_KEY: "${CI_DEFAULT_BRANCH}"
   # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
   # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
@@ -71,7 +73,7 @@ lint-docker-compose:
     - "bash .scripts/check-service.sh 'dbrepo-upload-service'"
 
 lint-helm-chart:
-  image: docker.io/alpine:3.20
+  image: docker.io/alpine:${ALPINE_VERSION}
   stage: lint
   before_script:
     - apk add helm
@@ -149,8 +151,8 @@ build-search-service:
     - "pip install pipenv"
     - "cd dbrepo-search-service && pipenv install --system --deploy"
 
-build-docker:
-  image: docker.io/docker:24-dind
+build-images:
+  image: docker.io/docker:${DOCKER_VERSION}-dind
   stage: build
   variables:
     DOCKER_BUILDKIT: 0
@@ -161,7 +163,7 @@ build-docker:
     - "make build-images"
 
 build-helm:
-  image: docker.io/docker:24-dind
+  image: docker.io/docker:${DOCKER_VERSION}-dind
   stage: build
   before_script:
     - apk add --no-cache helm make
@@ -340,7 +342,7 @@ test-lib:
 
 test-ui:
   stage: test
-  image: docker.io/docker:24-dind
+  image: docker.io/docker:${DOCKER_VERSION}-dind
   needs:
     - build-ui
   dependencies:
@@ -355,7 +357,7 @@ test-ui:
 
 release-images:
   stage: release
-  image: docker:24-dind
+  image: docker:${DOCKER_VERSION}-dind
   dependencies:
     - test-metadata-service
     - test-data-service
@@ -375,7 +377,7 @@ release-images:
 
 release-helm:
   stage: release
-  image: docker:24-dind
+  image: docker:${DOCKER_VERSION}-dind
   only:
     refs:
       - /^release-.*/
@@ -452,7 +454,7 @@ release-libs:
     - bash ./lib/python/release.sh
 
 verify-install-script:
-  image: docker.io/docker:24-dind
+  image: docker.io/docker:${DOCKER_VERSION}-dind
   stage: verify
   only:
     refs:
@@ -476,7 +478,7 @@ verify-dist:
     - "curl -v --output /dev/null --fail https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/${APP_VERSION}/dist.tar.gz"
 
 scan-sonarqube:
-  image: sonarsource/sonar-scanner-cli:10.0
+  image: sonarsource/sonar-scanner-cli:${SONARQUBE_VERSION}
   stage: scan
   only:
     refs:
-- 
GitLab