From 5fcc1d9e9caf010a3cd8496f39b35dc9a72070e3 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 12 Jan 2024 16:58:33 -0800 Subject: [PATCH] Update 25-rc to 25.0.0-rc.2 --- 25-rc/cli/Dockerfile | 10 +++++----- 25-rc/dind-rootless/Dockerfile | 4 ++-- 25-rc/dind/Dockerfile | 8 ++++---- 25-rc/windows/windowsservercore-1809/Dockerfile | 4 ++-- .../windowsservercore-ltsc2022/Dockerfile | 4 ++-- versions.json | 16 ++++++++-------- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/25-rc/cli/Dockerfile b/25-rc/cli/Dockerfile index 0cf862961..4f1fdb7ba 100644 --- a/25-rc/cli/Dockerfile +++ b/25-rc/cli/Dockerfile @@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf RUN set -eux; \ addgroup -g 2375 -S docker -ENV DOCKER_VERSION 25.0.0-rc.1 +ENV DOCKER_VERSION 25.0.0-rc.2 RUN set -eux; \ \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/dind-rootless/Dockerfile b/25-rc/dind-rootless/Dockerfile index 11bd99ef0..2ed98b2cd 100644 --- a/25-rc/dind-rootless/Dockerfile +++ b/25-rc/dind-rootless/Dockerfile @@ -24,10 +24,10 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/dind/Dockerfile b/25-rc/dind/Dockerfile index 9a1d77625..dcfacd199 100644 --- a/25-rc/dind/Dockerfile +++ b/25-rc/dind/Dockerfile @@ -67,16 +67,16 @@ RUN set -eux; \ apkArch="$(apk --print-arch)"; \ case "$apkArch" in \ 'x86_64') \ - url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.2.tgz'; \ ;; \ 'armhf') \ - url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.2.tgz'; \ ;; \ 'armv7') \ - url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.2.tgz'; \ ;; \ 'aarch64') \ - url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.1.tgz'; \ + url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.2.tgz'; \ ;; \ *) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \ esac; \ diff --git a/25-rc/windows/windowsservercore-1809/Dockerfile b/25-rc/windows/windowsservercore-1809/Dockerfile index 671951aba..9a245bfc5 100644 --- a/25-rc/windows/windowsservercore-1809/Dockerfile +++ b/25-rc/windows/windowsservercore-1809/Dockerfile @@ -15,8 +15,8 @@ RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); # doing this first to share cache across versions more aggressively -ENV DOCKER_VERSION 25.0.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.1.zip +ENV DOCKER_VERSION 25.0.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.2.zip # TODO ENV DOCKER_SHA256 # https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !! # (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though) diff --git a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile index 45388d459..7337b5ed5 100644 --- a/25-rc/windows/windowsservercore-ltsc2022/Dockerfile +++ b/25-rc/windows/windowsservercore-ltsc2022/Dockerfile @@ -15,8 +15,8 @@ RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \ [Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine); # doing this first to share cache across versions more aggressively -ENV DOCKER_VERSION 25.0.0-rc.1 -ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.1.zip +ENV DOCKER_VERSION 25.0.0-rc.2 +ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.2.zip # TODO ENV DOCKER_SHA256 # https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !! # (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though) diff --git a/versions.json b/versions.json index d50617910..5fc26222e 100644 --- a/versions.json +++ b/versions.json @@ -145,21 +145,21 @@ "25-rc": { "arches": { "amd64": { - "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-rc.2.tgz" }, "arm32v6": { - "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armel/docker-25.0.0-rc.2.tgz" }, "arm32v7": { - "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/armhf/docker-25.0.0-rc.2.tgz" }, "arm64v8": { - "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.1.tgz", - "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-rc.1.tgz" + "dockerUrl": "https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-rc.2.tgz", + "rootlessExtrasUrl": "https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-rc.2.tgz" }, "windows-amd64": { - "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.1.zip" + "dockerUrl": "https://download.docker.com/win/static/test/x86_64/docker-25.0.0-rc.2.zip" } }, "buildx": { @@ -281,6 +281,6 @@ "windows/windowsservercore-ltsc2022", "windows/windowsservercore-1809" ], - "version": "25.0.0-rc.1" + "version": "25.0.0-rc.2" } }