From 0f8a58e2047a32d59b961dc1cb1e30936c14956e Mon Sep 17 00:00:00 2001 From: nullck Date: Tue, 23 Jul 2024 11:05:45 -0300 Subject: [PATCH] chore: updating docker eng version(25.x) and docker compose(v2.26.0) --- runner/VERSION | 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 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/runner/VERSION b/runner/VERSION index c0bfda5123..cb19d02d9d 100644 --- a/runner/VERSION +++ b/runner/VERSION @@ -1,2 +1,2 @@ RUNNER_VERSION=2.317.0 -RUNNER_CONTAINER_HOOKS_VERSION=0.6.0 \ No newline at end of file +RUNNER_CONTAINER_HOOKS_VERSION=0.6.0 diff --git a/runner/actions-runner-dind.ubuntu-20.04.dockerfile b/runner/actions-runner-dind.ubuntu-20.04.dockerfile index 5213004d0f..49d448e88c 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=25.0.5 +ARG DOCKER_COMPOSE_VERSION=v2.26.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 9e9ec8660d..ab0cbcbf86 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=25.0.5 +ARG DOCKER_COMPOSE_VERSION=v2.26.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 142ca3ace6..7a4e1bae07 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=25.0.5 +ARG DOCKER_COMPOSE_VERSION=v2.26.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 a8d31e3984..ff9c147a03 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=25.0.5 +ARG DOCKER_COMPOSE_VERSION=v2.26.0 ARG DUMB_INIT_VERSION=1.2.5 ARG RUNNER_USER_UID=1001 ARG DOCKER_GROUP_GID=121