From 8e484637f9cfa6ff6d084bdae0107d87249eda2c Mon Sep 17 00:00:00 2001 From: Donal O'Brien Date: Mon, 27 Nov 2023 04:25:19 +0100 Subject: [PATCH] Upgrade docker and docker compose in line with GH hosted runners (#3053) Co-authored-by: Yusuke Kuoka --- .github/workflows/arc-release-runners.yaml | 2 +- CONTRIBUTING.md | 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.ubuntu-20.04.dockerfile | 4 ++-- runner/actions-runner-dind.ubuntu-22.04.dockerfile | 4 ++-- runner/actions-runner.ubuntu-20.04.dockerfile | 4 ++-- runner/actions-runner.ubuntu-22.04.dockerfile | 4 ++-- test/e2e/e2e_test.go | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/arc-release-runners.yaml b/.github/workflows/arc-release-runners.yaml index 211c1291..253793ab 100644 --- a/.github/workflows/arc-release-runners.yaml +++ b/.github/workflows/arc-release-runners.yaml @@ -17,7 +17,7 @@ env: PUSH_TO_REGISTRIES: true TARGET_ORG: actions-runner-controller TARGET_WORKFLOW: release-runners.yaml - DOCKER_VERSION: 20.10.23 + DOCKER_VERSION: 24.0.7 concurrency: group: ${{ github.workflow }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9207c3d9..7b62b5bb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -73,7 +73,7 @@ To make your development cycle faster, use the below command to update deploy an # Makefile VERSION=controller1 \ RUNNER_TAG=runner1 \ - make acceptance/pull acceptance/kind docker-build acceptance/load acceptance/deploy + make acceptance/pull acceptance/kind docker-buildx acceptance/load acceptance/deploy ``` If you've already deployed actions-runner-controller and only want to recreate pods to use the newer image, you can run: diff --git a/runner/Makefile b/runner/Makefile index 085d1b46..9f7de076 100644 --- a/runner/Makefile +++ b/runner/Makefile @@ -8,7 +8,7 @@ TARGETPLATFORM ?= $(shell arch) RUNNER_VERSION ?= 2.311.0 RUNNER_CONTAINER_HOOKS_VERSION ?= 0.5.0 -DOCKER_VERSION ?= 20.10.23 +DOCKER_VERSION ?= 24.0.7 # 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 bc84f460..1e65c8bc 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.20.0 +ARG DOCKER_COMPOSE_VERSION=v2.23.0 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 6fafdb5c..ba549638 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.20.0 +ARG DOCKER_COMPOSE_VERSION=v2.23.0 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 2b60c37c..5213004d 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=20.10.23 -ARG DOCKER_COMPOSE_VERSION=v2.20.0 +ARG DOCKER_VERSION=24.0.7 +ARG DOCKER_COMPOSE_VERSION=v2.23.0 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 25ad586c..9e9ec866 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=20.10.23 -ARG DOCKER_COMPOSE_VERSION=v2.20.0 +ARG DOCKER_VERSION=24.0.7 +ARG DOCKER_COMPOSE_VERSION=v2.23.0 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 2683d47f..142ca3ac 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=20.10.23 -ARG DOCKER_COMPOSE_VERSION=v2.20.0 +ARG DOCKER_VERSION=24.0.7 +ARG DOCKER_COMPOSE_VERSION=v2.23.0 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 a85833b2..a8d31e39 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=20.10.23 -ARG DOCKER_COMPOSE_VERSION=v2.20.0 +ARG DOCKER_VERSION=24.0.7 +ARG DOCKER_COMPOSE_VERSION=v2.23.0 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 0b8f5d18..a81a2de4 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -459,7 +459,7 @@ func buildVars(repo, ubuntuVer string) vars { runnerRootlessDindImage = testing.Img(runnerRootlessDindImageRepo, runnerImageTag) dindSidecarImageRepo = "docker" - dindSidecarImageTag = "20.10.23-dind" + dindSidecarImageTag = "24.0.7-dind" dindSidecarImage = testing.Img(dindSidecarImageRepo, dindSidecarImageTag) )