]> git.proxmox.com Git - mirror_qemu.git/commitdiff
gitlab: switch from 'stable' to 'latest' docker container tags
authorDaniel P. Berrangé <berrange@redhat.com>
Wed, 31 May 2023 14:06:54 +0000 (15:06 +0100)
committerRichard Henderson <richard.henderson@linaro.org>
Wed, 31 May 2023 17:29:14 +0000 (10:29 -0700)
The 'stable' and 'stable-dind' tags are not documented as supported
tags at:

  https://hub.docker.com/_/docker

Looking at their content they reflect docker 19.x.x release series,
were last built in Dec 2020, and have 3 critical and 20 high rated
CVEs unfixed. This obsolete status is attested by this commit:

  https://github.com/docker-library/docker/commit/606c63960a4845af7077721eb3900c706f5d0c5e

The 'stable-dind' tag in particular appears buggy as it is unable to
resolve DNS for Fedora repos:

  - Curl error (6): Couldn't resolve host name for https://mirrors.fedoraproject.org/metalink?repo=fedora-37&arch=x86_64&countme=1 [getaddrinfo() thread failed to start]

We used the 'stable' tag previously at the recommendation of GitLab
docs, but those docs are wrong and pending a fix:

  https://gitlab.com/gitlab-org/gitlab/-/issues/409430

Fixes: 5f63a67adb58478974b91f5e5c2b1222b5c7f2cc
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Camilla Conte <cconte@redhat.com>
Message-Id: <20230531140654.1141145-1-berrange@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
.gitlab-ci.d/container-template.yml
.gitlab-ci.d/opensbi.yml

index 9ac4a0ee259293840107cb66b98a2a2d408d4c1f..8c1370b8f004f253adcdda33ebfd23ef0ca5f608 100644 (file)
@@ -1,9 +1,9 @@
 .container_job_template:
   extends: .base_job_template
-  image: docker:stable
+  image: docker:latest
   stage: containers
   services:
-    - docker:stable-dind
+    - docker:dind
   before_script:
     - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest"
     - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest"
index 2e9d51764eee7b30fd8fbafedf5e622c3b382fb7..b4d7eef68804468445ecfa9a64608709ba450628 100644 (file)
@@ -42,9 +42,9 @@
 docker-opensbi:
   extends: .opensbi_job_rules
   stage: containers
-  image: docker:stable
+  image: docker:latest
   services:
-    - docker:stable-dind
+    - docker:dind
   variables:
     GIT_DEPTH: 3
     IMAGE_TAG: $CI_REGISTRY_IMAGE:opensbi-cross-build