From 34ebbf74d13124a5cb6fcb23c1d1bf3a5f11e965 Mon Sep 17 00:00:00 2001 From: Milas Bowman Date: Tue, 28 Feb 2023 17:18:13 -0500 Subject: [PATCH] Upgrade Docker Compose to v2.16.0 (#2327) --- 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 | 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/runner/actions-runner-dind-rootless.ubuntu-20.04.dockerfile b/runner/actions-runner-dind-rootless.ubuntu-20.04.dockerfile index 9cb3b34..1ee6f2b 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=0.2.0 # Docker and Docker Compose arguments ENV CHANNEL=stable -ARG DOCKER_COMPOSE_VERSION=v2.6.0 +ARG DOCKER_COMPOSE_VERSION=v2.16.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 d91fc7e..b5f02d9 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=0.2.0 # Docker and Docker Compose arguments ENV CHANNEL=stable -ARG DOCKER_COMPOSE_VERSION=v2.12.2 +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-dind.ubuntu-20.04.dockerfile b/runner/actions-runner-dind.ubuntu-20.04.dockerfile index f0ea6f0..fb83c16 100644 --- a/runner/actions-runner-dind.ubuntu-20.04.dockerfile +++ b/runner/actions-runner-dind.ubuntu-20.04.dockerfile @@ -6,7 +6,7 @@ ARG RUNNER_CONTAINER_HOOKS_VERSION=0.2.0 # Docker and Docker Compose arguments ARG CHANNEL=stable ARG DOCKER_VERSION=20.10.18 -ARG DOCKER_COMPOSE_VERSION=v2.6.0 +ARG DOCKER_COMPOSE_VERSION=v2.16.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 37f9c3e..65e0365 100644 --- a/runner/actions-runner-dind.ubuntu-22.04.dockerfile +++ b/runner/actions-runner-dind.ubuntu-22.04.dockerfile @@ -6,7 +6,7 @@ ARG RUNNER_CONTAINER_HOOKS_VERSION=0.2.0 # Docker and Docker Compose arguments ARG CHANNEL=stable ARG DOCKER_VERSION=20.10.21 -ARG DOCKER_COMPOSE_VERSION=v2.12.2 +ARG DOCKER_COMPOSE_VERSION=v2.16.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 6017b0e..0339174 100644 --- a/runner/actions-runner.ubuntu-20.04.dockerfile +++ b/runner/actions-runner.ubuntu-20.04.dockerfile @@ -6,7 +6,7 @@ ARG RUNNER_CONTAINER_HOOKS_VERSION=0.2.0 # Docker and Docker Compose arguments ARG CHANNEL=stable ARG DOCKER_VERSION=20.10.18 -ARG DOCKER_COMPOSE_VERSION=v2.6.0 +ARG DOCKER_COMPOSE_VERSION=v2.16.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 4150f77..2756017 100644 --- a/runner/actions-runner.ubuntu-22.04.dockerfile +++ b/runner/actions-runner.ubuntu-22.04.dockerfile @@ -6,7 +6,7 @@ ARG RUNNER_CONTAINER_HOOKS_VERSION=0.2.0 # Docker and Docker Compose arguments ARG CHANNEL=stable ARG DOCKER_VERSION=20.10.21 -ARG DOCKER_COMPOSE_VERSION=v2.12.2 +ARG DOCKER_COMPOSE_VERSION=v2.16.0 ARG DUMB_INIT_VERSION=1.2.5 ARG RUNNER_USER_UID=1001 ARG DOCKER_GROUP_GID=121