From 4615321588f285f7e9ee2564cc6ad1f4849adc9c Mon Sep 17 00:00:00 2001 From: Rafik Salama Date: Thu, 13 Nov 2025 11:31:17 +0100 Subject: [PATCH] Upgrade Docker and Docker Compose to match GH hosted runner (#4312) --- .github/workflows/arc-release-runners.yaml | 2 +- runner/Makefile | 2 +- runner/actions-runner-dind-rootless.ubuntu-20.04.dockerfile | 2 +- runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile | 2 +- runner/actions-runner-dind-rootless.ubuntu-24.04.dockerfile | 2 +- runner/actions-runner-dind.ubuntu-20.04.dockerfile | 4 ++-- runner/actions-runner-dind.ubuntu-22.04.dockerfile | 4 ++-- runner/actions-runner-dind.ubuntu-24.04.dockerfile | 4 ++-- runner/actions-runner.ubuntu-20.04.dockerfile | 4 ++-- runner/actions-runner.ubuntu-22.04.dockerfile | 4 ++-- runner/actions-runner.ubuntu-24.04.dockerfile | 4 ++-- test/e2e/e2e_test.go | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/arc-release-runners.yaml b/.github/workflows/arc-release-runners.yaml index 54bd9772..25b42c5d 100644 --- a/.github/workflows/arc-release-runners.yaml +++ b/.github/workflows/arc-release-runners.yaml @@ -19,7 +19,7 @@ env: PUSH_TO_REGISTRIES: true TARGET_ORG: actions-runner-controller TARGET_WORKFLOW: release-runners.yaml - DOCKER_VERSION: 24.0.7 + DOCKER_VERSION: 28.0.4 concurrency: group: ${{ github.workflow }} diff --git a/runner/Makefile b/runner/Makefile index 6e2fa773..78151267 100644 --- a/runner/Makefile +++ b/runner/Makefile @@ -8,7 +8,7 @@ TARGETPLATFORM ?= $(shell arch) RUNNER_VERSION ?= 2.329.0 RUNNER_CONTAINER_HOOKS_VERSION ?= 0.8.0 -DOCKER_VERSION ?= 24.0.7 +DOCKER_VERSION ?= 28.0.4 # default list of platforms for which multiarch image is built ifeq (${PLATFORMS}, ) diff --git a/runner/actions-runner-dind-rootless.ubuntu-20.04.dockerfile b/runner/actions-runner-dind-rootless.ubuntu-20.04.dockerfile index 1e65c8bc..f902043f 100644 --- a/runner/actions-runner-dind-rootless.ubuntu-20.04.dockerfile +++ b/runner/actions-runner-dind-rootless.ubuntu-20.04.dockerfile @@ -5,7 +5,7 @@ ARG RUNNER_VERSION ARG RUNNER_CONTAINER_HOOKS_VERSION # Docker and Docker Compose arguments ENV CHANNEL=stable -ARG DOCKER_COMPOSE_VERSION=v2.23.0 +ARG DOCKER_COMPOSE_VERSION=v2.38.2 ARG DUMB_INIT_VERSION=1.2.5 # Other arguments diff --git a/runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile b/runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile index 0639ccdf..ef769b63 100644 --- a/runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile +++ b/runner/actions-runner-dind-rootless.ubuntu-22.04.dockerfile @@ -5,7 +5,7 @@ ARG RUNNER_VERSION ARG RUNNER_CONTAINER_HOOKS_VERSION # Docker and Docker Compose arguments ENV CHANNEL=stable -ARG DOCKER_COMPOSE_VERSION=v2.23.0 +ARG DOCKER_COMPOSE_VERSION=v2.38.2 ARG DUMB_INIT_VERSION=1.2.5 ARG RUNNER_USER_UID=1001 diff --git a/runner/actions-runner-dind-rootless.ubuntu-24.04.dockerfile b/runner/actions-runner-dind-rootless.ubuntu-24.04.dockerfile index ea3d56ca..2a81b145 100644 --- a/runner/actions-runner-dind-rootless.ubuntu-24.04.dockerfile +++ b/runner/actions-runner-dind-rootless.ubuntu-24.04.dockerfile @@ -5,7 +5,7 @@ ARG RUNNER_VERSION ARG RUNNER_CONTAINER_HOOKS_VERSION # Docker and Docker Compose arguments ENV CHANNEL=stable -ARG DOCKER_COMPOSE_VERSION=v2.23.0 +ARG DOCKER_COMPOSE_VERSION=v2.38.2 ARG DUMB_INIT_VERSION=1.2.5 ARG RUNNER_USER_UID=1001 diff --git a/runner/actions-runner-dind.ubuntu-20.04.dockerfile b/runner/actions-runner-dind.ubuntu-20.04.dockerfile index 5213004d..7c590ffc 100644 --- a/runner/actions-runner-dind.ubuntu-20.04.dockerfile +++ b/runner/actions-runner-dind.ubuntu-20.04.dockerfile @@ -5,8 +5,8 @@ ARG RUNNER_VERSION ARG RUNNER_CONTAINER_HOOKS_VERSION # Docker and Docker Compose arguments ARG CHANNEL=stable -ARG DOCKER_VERSION=24.0.7 -ARG DOCKER_COMPOSE_VERSION=v2.23.0 +ARG DOCKER_VERSION=28.0.4 +ARG DOCKER_COMPOSE_VERSION=v2.38.2 ARG DUMB_INIT_VERSION=1.2.5 # Use 1001 and 121 for compatibility with GitHub-hosted runners diff --git a/runner/actions-runner-dind.ubuntu-22.04.dockerfile b/runner/actions-runner-dind.ubuntu-22.04.dockerfile index 9e9ec866..3a5a508b 100644 --- a/runner/actions-runner-dind.ubuntu-22.04.dockerfile +++ b/runner/actions-runner-dind.ubuntu-22.04.dockerfile @@ -5,8 +5,8 @@ ARG RUNNER_VERSION ARG RUNNER_CONTAINER_HOOKS_VERSION # Docker and Docker Compose arguments ARG CHANNEL=stable -ARG DOCKER_VERSION=24.0.7 -ARG DOCKER_COMPOSE_VERSION=v2.23.0 +ARG DOCKER_VERSION=28.0.4 +ARG DOCKER_COMPOSE_VERSION=v2.38.2 ARG DUMB_INIT_VERSION=1.2.5 ARG RUNNER_USER_UID=1001 ARG DOCKER_GROUP_GID=121 diff --git a/runner/actions-runner-dind.ubuntu-24.04.dockerfile b/runner/actions-runner-dind.ubuntu-24.04.dockerfile index de4bf852..a9ca2b51 100644 --- a/runner/actions-runner-dind.ubuntu-24.04.dockerfile +++ b/runner/actions-runner-dind.ubuntu-24.04.dockerfile @@ -5,8 +5,8 @@ ARG RUNNER_VERSION ARG RUNNER_CONTAINER_HOOKS_VERSION # Docker and Docker Compose arguments ARG CHANNEL=stable -ARG DOCKER_VERSION=24.0.7 -ARG DOCKER_COMPOSE_VERSION=v2.23.0 +ARG DOCKER_VERSION=28.0.4 +ARG DOCKER_COMPOSE_VERSION=v2.38.2 ARG DUMB_INIT_VERSION=1.2.5 ARG RUNNER_USER_UID=1001 ARG DOCKER_GROUP_GID=121 diff --git a/runner/actions-runner.ubuntu-20.04.dockerfile b/runner/actions-runner.ubuntu-20.04.dockerfile index 142ca3ac..901ce75d 100644 --- a/runner/actions-runner.ubuntu-20.04.dockerfile +++ b/runner/actions-runner.ubuntu-20.04.dockerfile @@ -5,8 +5,8 @@ ARG RUNNER_VERSION ARG RUNNER_CONTAINER_HOOKS_VERSION # Docker and Docker Compose arguments ARG CHANNEL=stable -ARG DOCKER_VERSION=24.0.7 -ARG DOCKER_COMPOSE_VERSION=v2.23.0 +ARG DOCKER_VERSION=28.0.4 +ARG DOCKER_COMPOSE_VERSION=v2.38.2 ARG DUMB_INIT_VERSION=1.2.5 # Use 1001 and 121 for compatibility with GitHub-hosted runners diff --git a/runner/actions-runner.ubuntu-22.04.dockerfile b/runner/actions-runner.ubuntu-22.04.dockerfile index a8d31e39..d2989504 100644 --- a/runner/actions-runner.ubuntu-22.04.dockerfile +++ b/runner/actions-runner.ubuntu-22.04.dockerfile @@ -5,8 +5,8 @@ ARG RUNNER_VERSION ARG RUNNER_CONTAINER_HOOKS_VERSION # Docker and Docker Compose arguments ARG CHANNEL=stable -ARG DOCKER_VERSION=24.0.7 -ARG DOCKER_COMPOSE_VERSION=v2.23.0 +ARG DOCKER_VERSION=28.0.4 +ARG DOCKER_COMPOSE_VERSION=v2.38.2 ARG DUMB_INIT_VERSION=1.2.5 ARG RUNNER_USER_UID=1001 ARG DOCKER_GROUP_GID=121 diff --git a/runner/actions-runner.ubuntu-24.04.dockerfile b/runner/actions-runner.ubuntu-24.04.dockerfile index a905590d..90bffa79 100644 --- a/runner/actions-runner.ubuntu-24.04.dockerfile +++ b/runner/actions-runner.ubuntu-24.04.dockerfile @@ -5,8 +5,8 @@ ARG RUNNER_VERSION ARG RUNNER_CONTAINER_HOOKS_VERSION # Docker and Docker Compose arguments ARG CHANNEL=stable -ARG DOCKER_VERSION=24.0.7 -ARG DOCKER_COMPOSE_VERSION=v2.23.0 +ARG DOCKER_VERSION=28.0.4 +ARG DOCKER_COMPOSE_VERSION=v2.38.2 ARG DUMB_INIT_VERSION=1.2.5 ARG RUNNER_USER_UID=1001 ARG DOCKER_GROUP_GID=121 diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 735f8055..68f4a284 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -455,7 +455,7 @@ func buildVars(repo, ubuntuVer string) vars { runnerRootlessDindImage = testing.Img(runnerRootlessDindImageRepo, runnerImageTag) dindSidecarImageRepo = "docker" - dindSidecarImageTag = "24.0.7-dind" + dindSidecarImageTag = "28.0.4-dind" dindSidecarImage = testing.Img(dindSidecarImageRepo, dindSidecarImageTag) )