Merge pull request #2697 from danielskinstad/pin-docker

ci: fix various`build:docker` issues
mendersoftware · Dec 11, 2024 · 61b8913 · 61b8913
2 parents 09ecfa4 + e4e0ba1
commit 61b8913
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.gitlab-ci-default-pipeline.yml b/.gitlab-ci-default-pipeline.yml
@@ -63,6 +63,8 @@ test:integration-tests:requirements:
     - pip install -r tests/requirements-python/python-requirements.txt
 
 build:docker:
+  tags:
+    - hetzner-amd-beefy
   variables:
     DOCKER_REPOSITORY: mendersoftware/mender-client-docker-addons
     DOCKER_DIR: extra/mender-client-docker-addons

diff --git a/.gitlab-ci-staging-tests.yml b/.gitlab-ci-staging-tests.yml
@@ -27,7 +27,8 @@ test:staging:backend-tests:
   timeout: 4h
 
   services:
-    - docker:dind
+    - name: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/docker:${DOCKER_VERSION}-dind
+      alias: docker
 
   variables:
     K8S: "staging"

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -49,7 +49,7 @@ variables:
 
   DOCKER_VERSION:
     description: "Docker version to use in jobs"
-    value: "27"
+    value: "27.3"
 
   MENDER_SERVER_TAG:
     description: "Mender Server Docker tag for running integration tests"