Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker #18483

Merged
merged 1 commit into from
Feb 19, 2025
Merged

Update docker #18483

merged 1 commit into from
Feb 19, 2025

Conversation

tianon
Copy link
Member

@tianon tianon commented Feb 19, 2025

Changes:

Changes:

- docker-library/docker@16fe5c4: Update 28-rc to 28.0.0-rc.3
Copy link

Diff for b53043b:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6524e05..755d4cd 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -41,41 +41,41 @@ Directory: 27/windows/windowsservercore-ltsc2025
 Builder: classic
 Constraints: windowsservercore-ltsc2025
 
-Tags: 28.0.0-rc.2-cli, 28-rc-cli, rc-cli, 28.0.0-rc.2-cli-alpine3.21
+Tags: 28.0.0-rc.3-cli, 28-rc-cli, rc-cli, 28.0.0-rc.3-cli-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: a835d8fa0def2d94f1a7509cc2ff07bdf57faf4e
+GitCommit: 16fe5c4f78ae9c1249533992f01a37284c4e9f0d
 Directory: 28-rc/cli
 
-Tags: 28.0.0-rc.2-dind, 28-rc-dind, rc-dind, 28.0.0-rc.2-dind-alpine3.21, 28.0.0-rc.2, 28-rc, rc, 28.0.0-rc.2-alpine3.21
+Tags: 28.0.0-rc.3-dind, 28-rc-dind, rc-dind, 28.0.0-rc.3-dind-alpine3.21, 28.0.0-rc.3, 28-rc, rc, 28.0.0-rc.3-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: a835d8fa0def2d94f1a7509cc2ff07bdf57faf4e
+GitCommit: 16fe5c4f78ae9c1249533992f01a37284c4e9f0d
 Directory: 28-rc/dind
 
-Tags: 28.0.0-rc.2-dind-rootless, 28-rc-dind-rootless, rc-dind-rootless
+Tags: 28.0.0-rc.3-dind-rootless, 28-rc-dind-rootless, rc-dind-rootless
 Architectures: amd64, arm64v8
-GitCommit: a835d8fa0def2d94f1a7509cc2ff07bdf57faf4e
+GitCommit: 16fe5c4f78ae9c1249533992f01a37284c4e9f0d
 Directory: 28-rc/dind-rootless
 
-Tags: 28.0.0-rc.2-windowsservercore-1809, 28-rc-windowsservercore-1809, rc-windowsservercore-1809
-SharedTags: 28.0.0-rc.2-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
+Tags: 28.0.0-rc.3-windowsservercore-1809, 28-rc-windowsservercore-1809, rc-windowsservercore-1809
+SharedTags: 28.0.0-rc.3-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
 Architectures: windows-amd64
-GitCommit: a835d8fa0def2d94f1a7509cc2ff07bdf57faf4e
+GitCommit: 16fe5c4f78ae9c1249533992f01a37284c4e9f0d
 Directory: 28-rc/windows/windowsservercore-1809
 Builder: classic
 Constraints: windowsservercore-1809
 
-Tags: 28.0.0-rc.2-windowsservercore-ltsc2022, 28-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
-SharedTags: 28.0.0-rc.2-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
+Tags: 28.0.0-rc.3-windowsservercore-ltsc2022, 28-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
+SharedTags: 28.0.0-rc.3-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
 Architectures: windows-amd64
-GitCommit: a835d8fa0def2d94f1a7509cc2ff07bdf57faf4e
+GitCommit: 16fe5c4f78ae9c1249533992f01a37284c4e9f0d
 Directory: 28-rc/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 28.0.0-rc.2-windowsservercore-ltsc2025, 28-rc-windowsservercore-ltsc2025, rc-windowsservercore-ltsc2025
-SharedTags: 28.0.0-rc.2-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
+Tags: 28.0.0-rc.3-windowsservercore-ltsc2025, 28-rc-windowsservercore-ltsc2025, rc-windowsservercore-ltsc2025
+SharedTags: 28.0.0-rc.3-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
 Architectures: windows-amd64
-GitCommit: a835d8fa0def2d94f1a7509cc2ff07bdf57faf4e
+GitCommit: 16fe5c4f78ae9c1249533992f01a37284c4e9f0d
 Directory: 28-rc/windows/windowsservercore-ltsc2025
 Builder: classic
 Constraints: windowsservercore-ltsc2025
diff --git a/_bashbrew-list b/_bashbrew-list
index 35cf968..3091e87 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -33,17 +33,17 @@ docker:28-rc-windowsservercore
 docker:28-rc-windowsservercore-1809
 docker:28-rc-windowsservercore-ltsc2022
 docker:28-rc-windowsservercore-ltsc2025
-docker:28.0.0-rc.2
-docker:28.0.0-rc.2-alpine3.21
-docker:28.0.0-rc.2-cli
-docker:28.0.0-rc.2-cli-alpine3.21
-docker:28.0.0-rc.2-dind
-docker:28.0.0-rc.2-dind-alpine3.21
-docker:28.0.0-rc.2-dind-rootless
-docker:28.0.0-rc.2-windowsservercore
-docker:28.0.0-rc.2-windowsservercore-1809
-docker:28.0.0-rc.2-windowsservercore-ltsc2022
-docker:28.0.0-rc.2-windowsservercore-ltsc2025
+docker:28.0.0-rc.3
+docker:28.0.0-rc.3-alpine3.21
+docker:28.0.0-rc.3-cli
+docker:28.0.0-rc.3-cli-alpine3.21
+docker:28.0.0-rc.3-dind
+docker:28.0.0-rc.3-dind-alpine3.21
+docker:28.0.0-rc.3-dind-rootless
+docker:28.0.0-rc.3-windowsservercore
+docker:28.0.0-rc.3-windowsservercore-1809
+docker:28.0.0-rc.3-windowsservercore-ltsc2022
+docker:28.0.0-rc.3-windowsservercore-ltsc2025
 docker:cli
 docker:dind
 docker:dind-rootless
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 186b05c..f243f65 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,5 +1,5 @@
 docker:27.5.1-cli-alpine3.21
-docker:28.0.0-rc.2-cli-alpine3.21
+docker:28.0.0-rc.3-cli-alpine3.21
 docker:rc-windowsservercore-1809
 docker:rc-windowsservercore-ltsc2022
 docker:rc-windowsservercore-ltsc2025
@@ -7,6 +7,6 @@ docker:windowsservercore-1809
 docker:windowsservercore-ltsc2022
 docker:windowsservercore-ltsc2025
 docker:27.5.1-alpine3.21
-docker:28.0.0-rc.2-alpine3.21
+docker:28.0.0-rc.3-alpine3.21
 docker:dind-rootless
 docker:rc-dind-rootless
diff --git a/docker_28.0.0-rc.2-alpine3.21/Dockerfile b/docker_28.0.0-rc.3-alpine3.21/Dockerfile
similarity index 97%
rename from docker_28.0.0-rc.2-alpine3.21/Dockerfile
rename to docker_28.0.0-rc.3-alpine3.21/Dockerfile
index 86bb9af..f33847d 100644
--- a/docker_28.0.0-rc.2-alpine3.21/Dockerfile
+++ b/docker_28.0.0-rc.3-alpine3.21/Dockerfile
@@ -61,16 +61,16 @@ RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.3.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.3.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.3.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.3.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_28.0.0-rc.2-alpine3.21/dockerd-entrypoint.sh b/docker_28.0.0-rc.3-alpine3.21/dockerd-entrypoint.sh
similarity index 100%
rename from docker_28.0.0-rc.2-alpine3.21/dockerd-entrypoint.sh
rename to docker_28.0.0-rc.3-alpine3.21/dockerd-entrypoint.sh
diff --git a/docker_28.0.0-rc.2-cli-alpine3.21/Dockerfile b/docker_28.0.0-rc.3-cli-alpine3.21/Dockerfile
similarity index 98%
rename from docker_28.0.0-rc.2-cli-alpine3.21/Dockerfile
rename to docker_28.0.0-rc.3-cli-alpine3.21/Dockerfile
index 4975cee..918ea37 100644
--- a/docker_28.0.0-rc.2-cli-alpine3.21/Dockerfile
+++ b/docker_28.0.0-rc.3-cli-alpine3.21/Dockerfile
@@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf
 RUN set -eux; \
 	addgroup -g 2375 -S docker
 
-ENV DOCKER_VERSION 28.0.0-rc.2
+ENV DOCKER_VERSION 28.0.0-rc.3
 
 RUN set -eux; \
 	\
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.3.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.3.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.3.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.3.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_28.0.0-rc.2-cli-alpine3.21/docker-entrypoint.sh b/docker_28.0.0-rc.3-cli-alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from docker_28.0.0-rc.2-cli-alpine3.21/docker-entrypoint.sh
rename to docker_28.0.0-rc.3-cli-alpine3.21/docker-entrypoint.sh
diff --git a/docker_28.0.0-rc.2-cli-alpine3.21/modprobe.sh b/docker_28.0.0-rc.3-cli-alpine3.21/modprobe.sh
similarity index 100%
rename from docker_28.0.0-rc.2-cli-alpine3.21/modprobe.sh
rename to docker_28.0.0-rc.3-cli-alpine3.21/modprobe.sh
diff --git a/docker_rc-dind-rootless/Dockerfile b/docker_rc-dind-rootless/Dockerfile
index 02705c4..9838c81 100644
--- a/docker_rc-dind-rootless/Dockerfile
+++ b/docker_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-28.0.0-rc.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.0.0-rc.3.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.0.0-rc.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.0.0-rc.3.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_rc-windowsservercore-1809/Dockerfile b/docker_rc-windowsservercore-1809/Dockerfile
index 9719035..f3be8f4 100644
--- a/docker_rc-windowsservercore-1809/Dockerfile
+++ b/docker_rc-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 28.0.0-rc.2
-ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.2.zip
+ENV DOCKER_VERSION 28.0.0-rc.3
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.3.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/docker_rc-windowsservercore-ltsc2022/Dockerfile b/docker_rc-windowsservercore-ltsc2022/Dockerfile
index 139cb73..3067286 100644
--- a/docker_rc-windowsservercore-ltsc2022/Dockerfile
+++ b/docker_rc-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 28.0.0-rc.2
-ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.2.zip
+ENV DOCKER_VERSION 28.0.0-rc.3
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.3.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/docker_rc-windowsservercore-ltsc2025/Dockerfile b/docker_rc-windowsservercore-ltsc2025/Dockerfile
index 8522626..bf7ec26 100644
--- a/docker_rc-windowsservercore-ltsc2025/Dockerfile
+++ b/docker_rc-windowsservercore-ltsc2025/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 28.0.0-rc.2
-ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.2.zip
+ENV DOCKER_VERSION 28.0.0-rc.3
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.0.0-rc.3.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)

Relevant Maintainers:

@tianon
Copy link
Member Author

tianon commented Feb 19, 2025

Windows failures are #18435 (comment):

The problem is that the windows-2025 runner is too old to run the mcr.microsoft.com/windows/servercore:ltsc2025 image released this week (actions/runner-images#11582).

@yosifkit yosifkit merged commit 6bc8857 into docker-library:master Feb 19, 2025
11 of 13 checks passed
@yosifkit yosifkit deleted the docker branch February 19, 2025 18:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants