diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d1f7de2f31b2f63edb4c0b5c04ef6af9a1a4dc2..f57525116928f7491d79f91ae5a30d1f39712bad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,7 +77,7 @@ lint_python_scripts: .build_docker_image: extends: .docker_image_builder_job_template - image: docker:24.0.1-cli + image: docker:26.1.4-cli variables: BUILD_TARGET: "" before_script: @@ -113,7 +113,7 @@ build_docker_dind_image: exists: - Dockerfile.docker-dind services: - - docker:24.0.1-dind + - docker:26.1.4-dind build_docker_builder_image: extends: .build_docker_image diff --git a/Dockerfile.docker-builder b/Dockerfile.docker-builder index 91d5f1bb49138867307c86d13fa81cf574c69381..40f1334edc0b670cde5c6a993bc32a765802c1ff 100644 --- a/Dockerfile.docker-builder +++ b/Dockerfile.docker-builder @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.4 -FROM docker:24.0.1-cli AS docker-builder +FROM docker:26.1.4-cli AS docker-builder RUN apk add --no-cache bash git coreutils ca-certificates curl sudo RUN <<EOF diff --git a/Dockerfile.docker-dind b/Dockerfile.docker-dind index 1f7e9f6817e94e5b8dd3eb88c1b825c0b876ac50..68b412f97265f3c507839bdb51dd9bd80a27b3ab 100644 --- a/Dockerfile.docker-dind +++ b/Dockerfile.docker-dind @@ -1,7 +1,7 @@ # To workaround a gitlab healthcheck bug, expose just single port. # See https://gitlab.com/gitlab-org/gitlab-runner/-/issues/29130#note_1028331564 and # https://gitlab.com/search?search=Service+docker+dind+probably+didn%27t+start+properly&nav_source=navbar&project_id=250833&group_id=9970&scope=issues&sort=updated_desc -FROM docker:24.0.1-dind as upstream +FROM docker:26.1.4-dind as upstream FROM scratch diff --git a/misc/docker-compose.dind.yml b/misc/docker-compose.dind.yml index f279729481fb26518646d9700c267c034355f694..dbffa8c1ca80e9b7a4612e732e9ca19678d0881f 100644 --- a/misc/docker-compose.dind.yml +++ b/misc/docker-compose.dind.yml @@ -1,7 +1,7 @@ version: '3.9' services: docker: - image: docker:20.10.21-dind + image: docker:26.1.4-dind privileged: true environment: - DOCKER_TLS_CERTDIR=/certs