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 #18492

Merged
merged 1 commit into from
Feb 20, 2025
Merged

Update docker #18492

merged 1 commit into from
Feb 20, 2025

Conversation

tianon
Copy link
Member

@tianon tianon commented Feb 20, 2025

Changes:

This comment has been minimized.

This comment has been minimized.

Changes:

- docker-library/docker@c337039: Merge pull request docker-library/docker#527 from infosiftr/28
- docker-library/docker@26c9e5f: Drop 27.x (now EOL)
- docker-library/docker@3e8d8de: Update 28-rc
- docker-library/docker@35c016d: Update 28 to 28.0.0, buildx 0.21.0, compose 2.33.0
- docker-library/docker@6b0b624: Update 28-rc to buildx 0.21.0
- docker-library/docker@40a1560: Update 27 to buildx 0.21.0
Copy link

Diff for e3aaf9c:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 755d4cd..b150a68 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,80 +2,41 @@ Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson
 GitRepo: https://github.com/docker-library/docker.git
 Builder: buildkit
 
-Tags: 27.5.1-cli, 27.5-cli, 27-cli, cli, 27.5.1-cli-alpine3.21
+Tags: 28.0.0-cli, 28.0-cli, 28-cli, cli, 28.0.0-cli-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 2738fa1f226f9ca12b0202bd2267da2f0817c6ae
-Directory: 27/cli
+GitCommit: 35c016d0c0f0be4dc523bc1108d7fa2681db8306
+Directory: 28/cli
 
-Tags: 27.5.1-dind, 27.5-dind, 27-dind, dind, 27.5.1-dind-alpine3.21, 27.5.1, 27.5, 27, latest, 27.5.1-alpine3.21
+Tags: 28.0.0-dind, 28.0-dind, 28-dind, dind, 28.0.0-dind-alpine3.21, 28.0.0, 28.0, 28, latest, 28.0.0-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: fbb79dd2512681b42f6f0a3a82543c29640b85ce
-Directory: 27/dind
+GitCommit: 35c016d0c0f0be4dc523bc1108d7fa2681db8306
+Directory: 28/dind
 
-Tags: 27.5.1-dind-rootless, 27.5-dind-rootless, 27-dind-rootless, dind-rootless
+Tags: 28.0.0-dind-rootless, 28.0-dind-rootless, 28-dind-rootless, dind-rootless
 Architectures: amd64, arm64v8
-GitCommit: 03ecb33955c16b34b7d52c7563f05c736f159875
-Directory: 27/dind-rootless
+GitCommit: 35c016d0c0f0be4dc523bc1108d7fa2681db8306
+Directory: 28/dind-rootless
 
-Tags: 27.5.1-windowsservercore-1809, 27.5-windowsservercore-1809, 27-windowsservercore-1809, windowsservercore-1809
-SharedTags: 27.5.1-windowsservercore, 27.5-windowsservercore, 27-windowsservercore, windowsservercore
+Tags: 28.0.0-windowsservercore-1809, 28.0-windowsservercore-1809, 28-windowsservercore-1809, windowsservercore-1809
+SharedTags: 28.0.0-windowsservercore, 28.0-windowsservercore, 28-windowsservercore, windowsservercore
 Architectures: windows-amd64
-GitCommit: 2738fa1f226f9ca12b0202bd2267da2f0817c6ae
-Directory: 27/windows/windowsservercore-1809
+GitCommit: 35c016d0c0f0be4dc523bc1108d7fa2681db8306
+Directory: 28/windows/windowsservercore-1809
 Builder: classic
 Constraints: windowsservercore-1809
 
-Tags: 27.5.1-windowsservercore-ltsc2022, 27.5-windowsservercore-ltsc2022, 27-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 27.5.1-windowsservercore, 27.5-windowsservercore, 27-windowsservercore, windowsservercore
+Tags: 28.0.0-windowsservercore-ltsc2022, 28.0-windowsservercore-ltsc2022, 28-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 28.0.0-windowsservercore, 28.0-windowsservercore, 28-windowsservercore, windowsservercore
 Architectures: windows-amd64
-GitCommit: 2738fa1f226f9ca12b0202bd2267da2f0817c6ae
-Directory: 27/windows/windowsservercore-ltsc2022
+GitCommit: 35c016d0c0f0be4dc523bc1108d7fa2681db8306
+Directory: 28/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 27.5.1-windowsservercore-ltsc2025, 27.5-windowsservercore-ltsc2025, 27-windowsservercore-ltsc2025, windowsservercore-ltsc2025
-SharedTags: 27.5.1-windowsservercore, 27.5-windowsservercore, 27-windowsservercore, windowsservercore
+Tags: 28.0.0-windowsservercore-ltsc2025, 28.0-windowsservercore-ltsc2025, 28-windowsservercore-ltsc2025, windowsservercore-ltsc2025
+SharedTags: 28.0.0-windowsservercore, 28.0-windowsservercore, 28-windowsservercore, windowsservercore
 Architectures: windows-amd64
-GitCommit: 2738fa1f226f9ca12b0202bd2267da2f0817c6ae
-Directory: 27/windows/windowsservercore-ltsc2025
-Builder: classic
-Constraints: windowsservercore-ltsc2025
-
-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: 16fe5c4f78ae9c1249533992f01a37284c4e9f0d
-Directory: 28-rc/cli
-
-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: 16fe5c4f78ae9c1249533992f01a37284c4e9f0d
-Directory: 28-rc/dind
-
-Tags: 28.0.0-rc.3-dind-rootless, 28-rc-dind-rootless, rc-dind-rootless
-Architectures: amd64, arm64v8
-GitCommit: 16fe5c4f78ae9c1249533992f01a37284c4e9f0d
-Directory: 28-rc/dind-rootless
-
-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: 16fe5c4f78ae9c1249533992f01a37284c4e9f0d
-Directory: 28-rc/windows/windowsservercore-1809
-Builder: classic
-Constraints: windowsservercore-1809
-
-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: 16fe5c4f78ae9c1249533992f01a37284c4e9f0d
-Directory: 28-rc/windows/windowsservercore-ltsc2022
-Builder: classic
-Constraints: windowsservercore-ltsc2022
-
-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: 16fe5c4f78ae9c1249533992f01a37284c4e9f0d
-Directory: 28-rc/windows/windowsservercore-ltsc2025
+GitCommit: 35c016d0c0f0be4dc523bc1108d7fa2681db8306
+Directory: 28/windows/windowsservercore-ltsc2025
 Builder: classic
 Constraints: windowsservercore-ltsc2025
diff --git a/_bashbrew-list b/_bashbrew-list
index 3091e87..cac7f20 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,61 +1,34 @@
-docker:27
-docker:27-cli
-docker:27-dind
-docker:27-dind-rootless
-docker:27-windowsservercore
-docker:27-windowsservercore-1809
-docker:27-windowsservercore-ltsc2022
-docker:27-windowsservercore-ltsc2025
-docker:27.5
-docker:27.5-cli
-docker:27.5-dind
-docker:27.5-dind-rootless
-docker:27.5-windowsservercore
-docker:27.5-windowsservercore-1809
-docker:27.5-windowsservercore-ltsc2022
-docker:27.5-windowsservercore-ltsc2025
-docker:27.5.1
-docker:27.5.1-alpine3.21
-docker:27.5.1-cli
-docker:27.5.1-cli-alpine3.21
-docker:27.5.1-dind
-docker:27.5.1-dind-alpine3.21
-docker:27.5.1-dind-rootless
-docker:27.5.1-windowsservercore
-docker:27.5.1-windowsservercore-1809
-docker:27.5.1-windowsservercore-ltsc2022
-docker:27.5.1-windowsservercore-ltsc2025
-docker:28-rc
-docker:28-rc-cli
-docker:28-rc-dind
-docker:28-rc-dind-rootless
-docker:28-rc-windowsservercore
-docker:28-rc-windowsservercore-1809
-docker:28-rc-windowsservercore-ltsc2022
-docker:28-rc-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:28
+docker:28-cli
+docker:28-dind
+docker:28-dind-rootless
+docker:28-windowsservercore
+docker:28-windowsservercore-1809
+docker:28-windowsservercore-ltsc2022
+docker:28-windowsservercore-ltsc2025
+docker:28.0
+docker:28.0-cli
+docker:28.0-dind
+docker:28.0-dind-rootless
+docker:28.0-windowsservercore
+docker:28.0-windowsservercore-1809
+docker:28.0-windowsservercore-ltsc2022
+docker:28.0-windowsservercore-ltsc2025
+docker:28.0.0
+docker:28.0.0-alpine3.21
+docker:28.0.0-cli
+docker:28.0.0-cli-alpine3.21
+docker:28.0.0-dind
+docker:28.0.0-dind-alpine3.21
+docker:28.0.0-dind-rootless
+docker:28.0.0-windowsservercore
+docker:28.0.0-windowsservercore-1809
+docker:28.0.0-windowsservercore-ltsc2022
+docker:28.0.0-windowsservercore-ltsc2025
 docker:cli
 docker:dind
 docker:dind-rootless
 docker:latest
-docker:rc
-docker:rc-cli
-docker:rc-dind
-docker:rc-dind-rootless
-docker:rc-windowsservercore
-docker:rc-windowsservercore-1809
-docker:rc-windowsservercore-ltsc2022
-docker:rc-windowsservercore-ltsc2025
 docker:windowsservercore
 docker:windowsservercore-1809
 docker:windowsservercore-ltsc2022
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index f243f65..97f3e07 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,12 +1,6 @@
-docker:27.5.1-cli-alpine3.21
-docker:28.0.0-rc.3-cli-alpine3.21
-docker:rc-windowsservercore-1809
-docker:rc-windowsservercore-ltsc2022
-docker:rc-windowsservercore-ltsc2025
+docker:28.0.0-cli-alpine3.21
 docker:windowsservercore-1809
 docker:windowsservercore-ltsc2022
 docker:windowsservercore-ltsc2025
-docker:27.5.1-alpine3.21
-docker:28.0.0-rc.3-alpine3.21
+docker:28.0.0-alpine3.21
 docker:dind-rootless
-docker:rc-dind-rootless
diff --git a/docker_27.5.1-alpine3.21/Dockerfile b/docker_28.0.0-alpine3.21/Dockerfile
similarity index 95%
rename from docker_27.5.1-alpine3.21/Dockerfile
rename to docker_28.0.0-alpine3.21/Dockerfile
index 9436571..59404fa 100644
--- a/docker_27.5.1-alpine3.21/Dockerfile
+++ b/docker_28.0.0-alpine3.21/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM docker:27-cli
+FROM docker:28-cli
 
 # https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies
 # https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41
@@ -61,16 +61,16 @@ RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://download.docker.com/linux/static/stable/x86_64/docker-27.5.1.tgz'; \
+			url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.0.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/stable/armel/docker-27.5.1.tgz'; \
+			url='https://download.docker.com/linux/static/stable/armel/docker-28.0.0.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/stable/armhf/docker-27.5.1.tgz'; \
+			url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.0.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/stable/aarch64/docker-27.5.1.tgz'; \
+			url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.0.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
@@ -82,7 +82,7 @@ RUN set -eux; \
 		--strip-components 1 \
 		--directory /usr/local/bin/ \
 		--no-same-owner \
-# we exclude the CLI binary because we already extracted that over in the "docker:27-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer
+# we exclude the CLI binary because we already extracted that over in the "docker:28-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer
 		--exclude 'docker/docker' \
 	; \
 	rm docker.tgz; \
diff --git a/docker_27.5.1-alpine3.21/dockerd-entrypoint.sh b/docker_28.0.0-alpine3.21/dockerd-entrypoint.sh
similarity index 100%
rename from docker_27.5.1-alpine3.21/dockerd-entrypoint.sh
rename to docker_28.0.0-alpine3.21/dockerd-entrypoint.sh
diff --git a/docker_27.5.1-cli-alpine3.21/Dockerfile b/docker_28.0.0-cli-alpine3.21/Dockerfile
similarity index 78%
rename from docker_27.5.1-cli-alpine3.21/Dockerfile
rename to docker_28.0.0-cli-alpine3.21/Dockerfile
index 85048e9..2044000 100644
--- a/docker_27.5.1-cli-alpine3.21/Dockerfile
+++ b/docker_28.0.0-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 27.5.1
+ENV DOCKER_VERSION 28.0.0
 
 RUN set -eux; \
 	\
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://download.docker.com/linux/static/stable/x86_64/docker-27.5.1.tgz'; \
+			url='https://download.docker.com/linux/static/stable/x86_64/docker-28.0.0.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/stable/armel/docker-27.5.1.tgz'; \
+			url='https://download.docker.com/linux/static/stable/armel/docker-28.0.0.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/stable/armhf/docker-27.5.1.tgz'; \
+			url='https://download.docker.com/linux/static/stable/armhf/docker-28.0.0.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/stable/aarch64/docker-27.5.1.tgz'; \
+			url='https://download.docker.com/linux/static/stable/aarch64/docker-28.0.0.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
@@ -57,38 +57,38 @@ RUN set -eux; \
 	\
 	docker --version
 
-ENV DOCKER_BUILDX_VERSION 0.20.1
+ENV DOCKER_BUILDX_VERSION 0.21.0
 RUN set -eux; \
 	\
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-amd64'; \
-			sha256='8c38f60308a895fa570f1410e453c5de11aafd65a99fa99965d96d24b6225a78'; \
+			url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-amd64'; \
+			sha256='90f154aff1b1b0010ca3e59f473a59a86b5fdf34ca1196829c622c4fbf5e92fe'; \
 			;; \
 		'armhf') \
-			url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v6'; \
-			sha256='ba0929f3389db9c407c23debb7c02faaf5e1d09da48c94905f0759736a39ee2f'; \
+			url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v6'; \
+			sha256='1a55ed189ee5c58b3d78459cf81d023a135a759c5ea3b7d1e2ad587cdfabac15'; \
 			;; \
 		'armv7') \
-			url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm-v7'; \
-			sha256='52672d1810f359685c171e85f7c96f71e32aa5f170d7841b32282a8e3ba16fce'; \
+			url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v7'; \
+			sha256='542676a5aa32ecfcfcb27c56a0c8d91af42614ed5c0266e91ed0b55d90a15555'; \
 			;; \
 		'aarch64') \
-			url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-arm64'; \
-			sha256='f7d867e9f1a3c00b32dd580f56594e229df05e3fb1b083b7099c91c2e7d2ce1e'; \
+			url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm64'; \
+			sha256='5543113b559ca523726c8979defa24466e451dbfa6ffe42c278d22a3f76a327a'; \
 			;; \
 		'ppc64le') \
-			url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-ppc64le'; \
-			sha256='7bee10600a6fb9f01cecae11e92e5b5271a732e5641580037b7f74fb84c033ea'; \
+			url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-ppc64le'; \
+			sha256='90c2748b59d0588cbd006e209ce8cecf202319213eba6542d01a5ce2f5c06f6e'; \
 			;; \
 		'riscv64') \
-			url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-riscv64'; \
-			sha256='f4cf6e6a6f27e571e5210cf6324b720c10548b0a0b59e0b1381b43fde0604c65'; \
+			url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-riscv64'; \
+			sha256='84148bbc57023004b186bf1ba618f987d9df51d3b588876bfc04f7a592fb9bc0'; \
 			;; \
 		's390x') \
-			url='https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.linux-s390x'; \
-			sha256='93d547dcecaeddd6fe6cc384110b532bf204126ef4ee3aa9ad9765c813a1b809'; \
+			url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-s390x'; \
+			sha256='541b0fe136f003db4e0e5e4e3ec4ae00a647b50d398e7f63201d1ea712218132'; \
 			;; \
 		*) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \
 	esac; \
diff --git a/docker_27.5.1-cli-alpine3.21/docker-entrypoint.sh b/docker_28.0.0-cli-alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from docker_27.5.1-cli-alpine3.21/docker-entrypoint.sh
rename to docker_28.0.0-cli-alpine3.21/docker-entrypoint.sh
diff --git a/docker_27.5.1-cli-alpine3.21/modprobe.sh b/docker_28.0.0-cli-alpine3.21/modprobe.sh
similarity index 100%
rename from docker_27.5.1-cli-alpine3.21/modprobe.sh
rename to docker_28.0.0-cli-alpine3.21/modprobe.sh
diff --git a/docker_28.0.0-rc.3-alpine3.21/Dockerfile b/docker_28.0.0-rc.3-alpine3.21/Dockerfile
deleted file mode 100644
index f33847d..0000000
diff --git a/docker_28.0.0-rc.3-alpine3.21/dockerd-entrypoint.sh b/docker_28.0.0-rc.3-alpine3.21/dockerd-entrypoint.sh
deleted file mode 100755
index 6c06bb8..0000000
diff --git a/docker_28.0.0-rc.3-cli-alpine3.21/Dockerfile b/docker_28.0.0-rc.3-cli-alpine3.21/Dockerfile
deleted file mode 100644
index 918ea37..0000000
diff --git a/docker_28.0.0-rc.3-cli-alpine3.21/docker-entrypoint.sh b/docker_28.0.0-rc.3-cli-alpine3.21/docker-entrypoint.sh
deleted file mode 100755
index d41cef8..0000000
diff --git a/docker_28.0.0-rc.3-cli-alpine3.21/modprobe.sh b/docker_28.0.0-rc.3-cli-alpine3.21/modprobe.sh
deleted file mode 100755
index b357d89..0000000
diff --git a/docker_dind-rootless/Dockerfile b/docker_dind-rootless/Dockerfile
index 73bbb50..011fad0 100644
--- a/docker_dind-rootless/Dockerfile
+++ b/docker_dind-rootless/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM docker:27-dind
+FROM docker:28-dind
 
 # busybox "ip" is insufficient:
 #   [rootlesskit:child ] error: executing [[ip tuntap add name tap0 mode tap] [ip link set tap0 address 02:50:00:00:00:01]]: exit status 1
@@ -24,10 +24,10 @@ RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.5.1.tgz'; \
+			url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.0.0.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.5.1.tgz'; \
+			url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.0.0.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
@@ -39,7 +39,6 @@ RUN set -eux; \
 		--strip-components 1 \
 		--directory /usr/local/bin/ \
 		'docker-rootless-extras/rootlesskit' \
-		'docker-rootless-extras/rootlesskit-docker-proxy' \
 		'docker-rootless-extras/vpnkit' \
 	; \
 	rm rootless.tgz; \
diff --git a/docker_rc-dind-rootless/Dockerfile b/docker_rc-dind-rootless/Dockerfile
deleted file mode 100644
index 9838c81..0000000
diff --git a/docker_rc-windowsservercore-1809/Dockerfile b/docker_rc-windowsservercore-1809/Dockerfile
deleted file mode 100644
index f3be8f4..0000000
diff --git a/docker_rc-windowsservercore-ltsc2022/Dockerfile b/docker_rc-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index 3067286..0000000
diff --git a/docker_rc-windowsservercore-ltsc2025/Dockerfile b/docker_rc-windowsservercore-ltsc2025/Dockerfile
deleted file mode 100644
index bf7ec26..0000000
diff --git a/docker_windowsservercore-1809/Dockerfile b/docker_windowsservercore-1809/Dockerfile
index fb641c0..4d1a6f8 100644
--- a/docker_windowsservercore-1809/Dockerfile
+++ b/docker_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 27.5.1
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.1.zip
+ENV DOCKER_VERSION 28.0.0
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.0.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)
@@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \
 	Write-Host 'Complete.';
 
 # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414
-ENV DOCKER_BUILDX_VERSION 0.20.1
-ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe
-ENV DOCKER_BUILDX_SHA256 39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2
+ENV DOCKER_BUILDX_VERSION 0.21.0
+ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe
+ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d
 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
 	Write-Host ('Creating {0} ...' -f $dir); \
 	New-Item -ItemType Directory $dir -Force; \
diff --git a/docker_windowsservercore-ltsc2022/Dockerfile b/docker_windowsservercore-ltsc2022/Dockerfile
index 7d5b2a9..38f43b5 100644
--- a/docker_windowsservercore-ltsc2022/Dockerfile
+++ b/docker_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 27.5.1
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.1.zip
+ENV DOCKER_VERSION 28.0.0
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.0.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)
@@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \
 	Write-Host 'Complete.';
 
 # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414
-ENV DOCKER_BUILDX_VERSION 0.20.1
-ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe
-ENV DOCKER_BUILDX_SHA256 39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2
+ENV DOCKER_BUILDX_VERSION 0.21.0
+ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe
+ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d
 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
 	Write-Host ('Creating {0} ...' -f $dir); \
 	New-Item -ItemType Directory $dir -Force; \
diff --git a/docker_windowsservercore-ltsc2025/Dockerfile b/docker_windowsservercore-ltsc2025/Dockerfile
index 314cdbb..f5a76b3 100644
--- a/docker_windowsservercore-ltsc2025/Dockerfile
+++ b/docker_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 27.5.1
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.1.zip
+ENV DOCKER_VERSION 28.0.0
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.0.0.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)
@@ -40,9 +40,9 @@ RUN Write-Host ('Downloading {0} ...' -f $env:DOCKER_URL); \
 	Write-Host 'Complete.';
 
 # https://github.com/docker-library/docker/issues/409#issuecomment-1462868414
-ENV DOCKER_BUILDX_VERSION 0.20.1
-ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.20.1/buildx-v0.20.1.windows-amd64.exe
-ENV DOCKER_BUILDX_SHA256 39f53ec70c6ce37beca6898809e8eb89a77a1651be35ea50b51629c7a5d3b1f2
+ENV DOCKER_BUILDX_VERSION 0.21.0
+ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.windows-amd64.exe
+ENV DOCKER_BUILDX_SHA256 a8e63d104cfb4b1441d6eb429639851758902c6caf1ef5e3d4dfb3964683a26d
 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
 	Write-Host ('Creating {0} ...' -f $dir); \
 	New-Item -ItemType Directory $dir -Force; \

Relevant Maintainers:

@LaurentGoderre
Copy link
Member

About Windows failure:

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).

@tianon tianon merged commit 67ee09c into docker-library:master Feb 20, 2025
8 of 9 checks passed
@tianon tianon deleted the docker branch February 20, 2025 23:03
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