Skip to content

Update docker #19278

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

Merged
merged 1 commit into from
Jun 16, 2025
Merged

Update docker #19278

merged 1 commit into from
Jun 16, 2025

Conversation

tianon
Copy link
Member

@tianon tianon commented Jun 16, 2025

Changes:

Changes:

- docker-library/docker@76619ec: Update 28-rc to 28.3.0-rc.1, buildx 0.24.0, compose 2.37.1
@tianon tianon requested review from LaurentGoderre and a team as code owners June 16, 2025 17:09
Copy link

Diff for c42da42:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 70d0e0d..74d0af6 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -32,3 +32,34 @@ GitCommit: 46b52b3a685ae16281bb08c1df1622f0a5b3ae24
 Directory: 28/windows/windowsservercore-ltsc2025
 Builder: classic
 Constraints: windowsservercore-ltsc2025
+
+Tags: 28.3.0-rc.1-cli, 28-rc-cli, rc-cli, 28.3.0-rc.1-cli-alpine3.22
+Architectures: amd64, arm32v6, arm32v7, arm64v8
+GitCommit: 76619ecee54053ecbbb38f1d4a8c5d40d3688b1c
+Directory: 28-rc/cli
+
+Tags: 28.3.0-rc.1-dind, 28-rc-dind, rc-dind, 28.3.0-rc.1-dind-alpine3.22, 28.3.0-rc.1, 28-rc, rc, 28.3.0-rc.1-alpine3.22
+Architectures: amd64, arm32v6, arm32v7, arm64v8
+GitCommit: 76619ecee54053ecbbb38f1d4a8c5d40d3688b1c
+Directory: 28-rc/dind
+
+Tags: 28.3.0-rc.1-dind-rootless, 28-rc-dind-rootless, rc-dind-rootless
+Architectures: amd64, arm64v8
+GitCommit: 76619ecee54053ecbbb38f1d4a8c5d40d3688b1c
+Directory: 28-rc/dind-rootless
+
+Tags: 28.3.0-rc.1-windowsservercore-ltsc2022, 28-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
+SharedTags: 28.3.0-rc.1-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
+Architectures: windows-amd64
+GitCommit: 76619ecee54053ecbbb38f1d4a8c5d40d3688b1c
+Directory: 28-rc/windows/windowsservercore-ltsc2022
+Builder: classic
+Constraints: windowsservercore-ltsc2022
+
+Tags: 28.3.0-rc.1-windowsservercore-ltsc2025, 28-rc-windowsservercore-ltsc2025, rc-windowsservercore-ltsc2025
+SharedTags: 28.3.0-rc.1-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
+Architectures: windows-amd64
+GitCommit: 76619ecee54053ecbbb38f1d4a8c5d40d3688b1c
+Directory: 28-rc/windows/windowsservercore-ltsc2025
+Builder: classic
+Constraints: windowsservercore-ltsc2025
diff --git a/_bashbrew-list b/_bashbrew-list
index 055fbd2..b18f9a4 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,6 +2,13 @@ docker:28
 docker:28-cli
 docker:28-dind
 docker:28-dind-rootless
+docker:28-rc
+docker:28-rc-cli
+docker:28-rc-dind
+docker:28-rc-dind-rootless
+docker:28-rc-windowsservercore
+docker:28-rc-windowsservercore-ltsc2022
+docker:28-rc-windowsservercore-ltsc2025
 docker:28-windowsservercore
 docker:28-windowsservercore-ltsc2022
 docker:28-windowsservercore-ltsc2025
@@ -22,10 +29,27 @@ docker:28.2.2-dind-rootless
 docker:28.2.2-windowsservercore
 docker:28.2.2-windowsservercore-ltsc2022
 docker:28.2.2-windowsservercore-ltsc2025
+docker:28.3.0-rc.1
+docker:28.3.0-rc.1-alpine3.22
+docker:28.3.0-rc.1-cli
+docker:28.3.0-rc.1-cli-alpine3.22
+docker:28.3.0-rc.1-dind
+docker:28.3.0-rc.1-dind-alpine3.22
+docker:28.3.0-rc.1-dind-rootless
+docker:28.3.0-rc.1-windowsservercore
+docker:28.3.0-rc.1-windowsservercore-ltsc2022
+docker:28.3.0-rc.1-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-ltsc2022
+docker:rc-windowsservercore-ltsc2025
 docker:windowsservercore
 docker:windowsservercore-ltsc2022
 docker:windowsservercore-ltsc2025
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 49d7ac1..d92674e 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,5 +1,10 @@
 docker:28.2.2-cli-alpine3.22
+docker:28.3.0-rc.1-cli-alpine3.22
+docker:rc-windowsservercore-ltsc2022
+docker:rc-windowsservercore-ltsc2025
 docker:windowsservercore-ltsc2022
 docker:windowsservercore-ltsc2025
 docker:28.2.2-alpine3.22
+docker:28.3.0-rc.1-alpine3.22
 docker:dind-rootless
+docker:rc-dind-rootless
diff --git a/docker_28.2.2-alpine3.22/Dockerfile b/docker_28.3.0-rc.1-alpine3.22/Dockerfile
similarity index 85%
copy from docker_28.2.2-alpine3.22/Dockerfile
copy to docker_28.3.0-rc.1-alpine3.22/Dockerfile
index 3fda747..d2dab14 100644
--- a/docker_28.2.2-alpine3.22/Dockerfile
+++ b/docker_28.3.0-rc.1-alpine3.22/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM docker:28-cli
+FROM docker:28-rc-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-28.2.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/x86_64/docker-28.3.0-rc.1.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/stable/armel/docker-28.2.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/armel/docker-28.3.0-rc.1.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/stable/armhf/docker-28.2.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/armhf/docker-28.3.0-rc.1.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/stable/aarch64/docker-28.2.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/aarch64/docker-28.3.0-rc.1.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:28-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-rc-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_28.2.2-alpine3.22/dockerd-entrypoint.sh b/docker_28.3.0-rc.1-alpine3.22/dockerd-entrypoint.sh
similarity index 100%
copy from docker_28.2.2-alpine3.22/dockerd-entrypoint.sh
copy to docker_28.3.0-rc.1-alpine3.22/dockerd-entrypoint.sh
diff --git a/docker_28.2.2-cli-alpine3.22/Dockerfile b/docker_28.3.0-rc.1-cli-alpine3.22/Dockerfile
similarity index 94%
copy from docker_28.2.2-cli-alpine3.22/Dockerfile
copy to docker_28.3.0-rc.1-cli-alpine3.22/Dockerfile
index 4160d1a..f8ba30f 100644
--- a/docker_28.2.2-cli-alpine3.22/Dockerfile
+++ b/docker_28.3.0-rc.1-cli-alpine3.22/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.2.2
+ENV DOCKER_VERSION 28.3.0-rc.1
 
 RUN set -eux; \
 	\
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://download.docker.com/linux/static/stable/x86_64/docker-28.2.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/x86_64/docker-28.3.0-rc.1.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/stable/armel/docker-28.2.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/armel/docker-28.3.0-rc.1.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/stable/armhf/docker-28.2.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/armhf/docker-28.3.0-rc.1.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/stable/aarch64/docker-28.2.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/aarch64/docker-28.3.0-rc.1.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_28.2.2-cli-alpine3.22/docker-entrypoint.sh b/docker_28.3.0-rc.1-cli-alpine3.22/docker-entrypoint.sh
similarity index 100%
copy from docker_28.2.2-cli-alpine3.22/docker-entrypoint.sh
copy to docker_28.3.0-rc.1-cli-alpine3.22/docker-entrypoint.sh
diff --git a/docker_28.2.2-cli-alpine3.22/modprobe.sh b/docker_28.3.0-rc.1-cli-alpine3.22/modprobe.sh
similarity index 100%
copy from docker_28.2.2-cli-alpine3.22/modprobe.sh
copy to docker_28.3.0-rc.1-cli-alpine3.22/modprobe.sh
diff --git a/docker_dind-rootless/Dockerfile b/docker_rc-dind-rootless/Dockerfile
similarity index 85%
copy from docker_dind-rootless/Dockerfile
copy to docker_rc-dind-rootless/Dockerfile
index d1e1038..2504a0c 100644
--- a/docker_dind-rootless/Dockerfile
+++ b/docker_rc-dind-rootless/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM docker:28-dind
+FROM docker:28-rc-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-28.2.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.3.0-rc.1.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.2.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.3.0-rc.1.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_windowsservercore-ltsc2022/Dockerfile b/docker_rc-windowsservercore-ltsc2022/Dockerfile
similarity index 96%
copy from docker_windowsservercore-ltsc2022/Dockerfile
copy to docker_rc-windowsservercore-ltsc2022/Dockerfile
index ba587f1..100182f 100644
--- a/docker_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.2.2
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.2.zip
+ENV DOCKER_VERSION 28.3.0-rc.1
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.3.0-rc.1.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_windowsservercore-ltsc2025/Dockerfile b/docker_rc-windowsservercore-ltsc2025/Dockerfile
similarity index 96%
copy from docker_windowsservercore-ltsc2025/Dockerfile
copy to docker_rc-windowsservercore-ltsc2025/Dockerfile
index e46c0c3..cf25dd1 100644
--- a/docker_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.2.2
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.2.zip
+ENV DOCKER_VERSION 28.3.0-rc.1
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.3.0-rc.1.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:

@yosifkit yosifkit merged commit 96955d8 into docker-library:master Jun 16, 2025
11 checks passed
@yosifkit yosifkit deleted the docker branch June 16, 2025 17:50
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