From af625dd1cbb41f2ceb5d3982e7fdec9991dd1531 Mon Sep 17 00:00:00 2001 From: Milas Bowman Date: Sun, 12 Mar 2023 21:29:40 -0400 Subject: [PATCH] Upgrade to Docker Engine v20.10.23 (#2328) Co-authored-by: Yusuke Kuoka --- .github/workflows/release-runners.yaml | 2 +- runner/Makefile | 2 +- runner/actions-runner-dind.ubuntu-20.04.dockerfile | 2 +- runner/actions-runner-dind.ubuntu-22.04.dockerfile | 2 +- runner/actions-runner.ubuntu-20.04.dockerfile | 2 +- runner/actions-runner.ubuntu-22.04.dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-runners.yaml b/.github/workflows/release-runners.yaml index 5e6f1efe..7a2334fa 100644 --- a/.github/workflows/release-runners.yaml +++ b/.github/workflows/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.21 + DOCKER_VERSION: 20.10.23 RUNNER_CONTAINER_HOOKS_VERSION: 0.2.0 jobs: diff --git a/runner/Makefile b/runner/Makefile index acd5fd70..e98a933a 100644 --- a/runner/Makefile +++ b/runner/Makefile @@ -8,7 +8,7 @@ TARGETPLATFORM ?= $(shell arch) RUNNER_VERSION ?= 2.302.1 RUNNER_CONTAINER_HOOKS_VERSION ?= 0.2.0 -DOCKER_VERSION ?= 20.10.21 +DOCKER_VERSION ?= 20.10.23 # default list of platforms for which multiarch image is built ifeq (${PLATFORMS}, ) diff --git a/runner/actions-runner-dind.ubuntu-20.04.dockerfile b/runner/actions-runner-dind.ubuntu-20.04.dockerfile index fb83c166..da19b4b8 100644 --- a/runner/actions-runner-dind.ubuntu-20.04.dockerfile +++ b/runner/actions-runner-dind.ubuntu-20.04.dockerfile @@ -5,7 +5,7 @@ ARG RUNNER_VERSION ARG RUNNER_CONTAINER_HOOKS_VERSION=0.2.0 # Docker and Docker Compose arguments ARG CHANNEL=stable -ARG DOCKER_VERSION=20.10.18 +ARG DOCKER_VERSION=20.10.23 ARG DOCKER_COMPOSE_VERSION=v2.16.0 ARG DUMB_INIT_VERSION=1.2.5 diff --git a/runner/actions-runner-dind.ubuntu-22.04.dockerfile b/runner/actions-runner-dind.ubuntu-22.04.dockerfile index 65e03658..3532f2a5 100644 --- a/runner/actions-runner-dind.ubuntu-22.04.dockerfile +++ b/runner/actions-runner-dind.ubuntu-22.04.dockerfile @@ -5,7 +5,7 @@ ARG RUNNER_VERSION ARG RUNNER_CONTAINER_HOOKS_VERSION=0.2.0 # Docker and Docker Compose arguments ARG CHANNEL=stable -ARG DOCKER_VERSION=20.10.21 +ARG DOCKER_VERSION=20.10.23 ARG DOCKER_COMPOSE_VERSION=v2.16.0 ARG DUMB_INIT_VERSION=1.2.5 ARG RUNNER_USER_UID=1001 diff --git a/runner/actions-runner.ubuntu-20.04.dockerfile b/runner/actions-runner.ubuntu-20.04.dockerfile index 0339174f..5c246a0c 100644 --- a/runner/actions-runner.ubuntu-20.04.dockerfile +++ b/runner/actions-runner.ubuntu-20.04.dockerfile @@ -5,7 +5,7 @@ ARG RUNNER_VERSION ARG RUNNER_CONTAINER_HOOKS_VERSION=0.2.0 # Docker and Docker Compose arguments ARG CHANNEL=stable -ARG DOCKER_VERSION=20.10.18 +ARG DOCKER_VERSION=20.10.23 ARG DOCKER_COMPOSE_VERSION=v2.16.0 ARG DUMB_INIT_VERSION=1.2.5 diff --git a/runner/actions-runner.ubuntu-22.04.dockerfile b/runner/actions-runner.ubuntu-22.04.dockerfile index 27560175..966856fb 100644 --- a/runner/actions-runner.ubuntu-22.04.dockerfile +++ b/runner/actions-runner.ubuntu-22.04.dockerfile @@ -5,7 +5,7 @@ ARG RUNNER_VERSION ARG RUNNER_CONTAINER_HOOKS_VERSION=0.2.0 # Docker and Docker Compose arguments ARG CHANNEL=stable -ARG DOCKER_VERSION=20.10.21 +ARG DOCKER_VERSION=20.10.23 ARG DOCKER_COMPOSE_VERSION=v2.16.0 ARG DUMB_INIT_VERSION=1.2.5 ARG RUNNER_USER_UID=1001