Merge branch 'master' into dev

Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>

.gitlab-ci.yml

@@ -9,6 +9,7 @@ variables:
   JAVA_VERSION: "17"
   NODE_VERSION: "18"
   SONARQUBE_VERSION: "10.0"
+  REGCLIENT_VERSION: "0.8.2"
   BUN_VERSION: "1.1.40"
   DOC_VERSION: "1.8"
   APP_VERSION: "1.8.0"
@@ -549,7 +550,7 @@ clean-images:
     - "docker logout ${CI_REGISTRY2_URL}"
     - "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin ${CI_REGISTRY2_URL}"
     - "apk add --no-cache wget bash"
-    - "wget -O /usr/local/sbin/regctl https://github.com/regclient/regclient/releases/download/v0.8.2/regctl-linux-amd64"
+    - "wget -O /usr/local/sbin/regctl https://github.com/regclient/regclient/releases/download/v${REGCLIENT_VERSION}/regctl-linux-amd64"
     - "chmod +x /usr/local/sbin/regctl"
   script:
     - bash ./.gitlab/remove-unsupported-images.sh
@@ -697,7 +698,6 @@ verify-dist:
   stage: verify
   only:
     - /^release-.*/
-    - master
   before_script:
     - "apk add curl"
   script:
@@ -707,7 +707,11 @@ verify-images:
   image: docker.io/docker:${DOCKER_VERSION}-dind
   stage: verify
   only:
-    - master
+    - /^release-.*/
+  before_script:
+    - "apk add --no-cache wget bash"
+    - "wget -O /usr/local/sbin/regctl https://github.com/regclient/regclient/releases/download/v${REGCLIENT_VERSION}/regctl-linux-amd64"
+    - "chmod +x /usr/local/sbin/regctl"
   script:
     - bash ./.gitlab/check-unsupported-images.sh