-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Update docker #19130
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
Update docker #19130
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changes: - docker-library/docker@b76938f: Update 28-rc - docker-library/docker@1aa2d6b: Update 28 to 28.2.1
Diff for 4cb7eb4:diff --git a/_bashbrew-cat b/_bashbrew-cat
index a9770ef..2351b0f 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,80 +2,41 @@ Maintainers: Tianon Gravi <tianon@dockerproject.org> (@tianon), Joseph Ferguson
GitRepo: https://github.com/docker-library/docker.git
Builder: buildkit
-Tags: 28.1.1-cli, 28.1-cli, 28-cli, cli, 28.1.1-cli-alpine3.21
+Tags: 28.2.1-cli, 28.2-cli, 28-cli, cli, 28.2.1-cli-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: fd9ffd927316fe34adddaa0e1fccd65307b09e2c
+GitCommit: 1aa2d6b7d29531b6ab43d1bd6912745d2d522674
Directory: 28/cli
-Tags: 28.1.1-dind, 28.1-dind, 28-dind, dind, 28.1.1-dind-alpine3.21, 28.1.1, 28.1, 28, latest, 28.1.1-alpine3.21
+Tags: 28.2.1-dind, 28.2-dind, 28-dind, dind, 28.2.1-dind-alpine3.21, 28.2.1, 28.2, 28, latest, 28.2.1-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 52c8bfa9869c9c5605c6c03dc9a82cfe426ace77
+GitCommit: 1aa2d6b7d29531b6ab43d1bd6912745d2d522674
Directory: 28/dind
-Tags: 28.1.1-dind-rootless, 28.1-dind-rootless, 28-dind-rootless, dind-rootless
+Tags: 28.2.1-dind-rootless, 28.2-dind-rootless, 28-dind-rootless, dind-rootless
Architectures: amd64, arm64v8
-GitCommit: 84fa8e735cf571bd16f439e8431ad23913dd19f4
+GitCommit: 1aa2d6b7d29531b6ab43d1bd6912745d2d522674
Directory: 28/dind-rootless
-Tags: 28.1.1-windowsservercore-1809, 28.1-windowsservercore-1809, 28-windowsservercore-1809, windowsservercore-1809
-SharedTags: 28.1.1-windowsservercore, 28.1-windowsservercore, 28-windowsservercore, windowsservercore
+Tags: 28.2.1-windowsservercore-1809, 28.2-windowsservercore-1809, 28-windowsservercore-1809, windowsservercore-1809
+SharedTags: 28.2.1-windowsservercore, 28.2-windowsservercore, 28-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: fd9ffd927316fe34adddaa0e1fccd65307b09e2c
+GitCommit: 1aa2d6b7d29531b6ab43d1bd6912745d2d522674
Directory: 28/windows/windowsservercore-1809
Builder: classic
Constraints: windowsservercore-1809
-Tags: 28.1.1-windowsservercore-ltsc2022, 28.1-windowsservercore-ltsc2022, 28-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 28.1.1-windowsservercore, 28.1-windowsservercore, 28-windowsservercore, windowsservercore
+Tags: 28.2.1-windowsservercore-ltsc2022, 28.2-windowsservercore-ltsc2022, 28-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 28.2.1-windowsservercore, 28.2-windowsservercore, 28-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: fd9ffd927316fe34adddaa0e1fccd65307b09e2c
+GitCommit: 1aa2d6b7d29531b6ab43d1bd6912745d2d522674
Directory: 28/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
-Tags: 28.1.1-windowsservercore-ltsc2025, 28.1-windowsservercore-ltsc2025, 28-windowsservercore-ltsc2025, windowsservercore-ltsc2025
-SharedTags: 28.1.1-windowsservercore, 28.1-windowsservercore, 28-windowsservercore, windowsservercore
+Tags: 28.2.1-windowsservercore-ltsc2025, 28.2-windowsservercore-ltsc2025, 28-windowsservercore-ltsc2025, windowsservercore-ltsc2025
+SharedTags: 28.2.1-windowsservercore, 28.2-windowsservercore, 28-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: fd9ffd927316fe34adddaa0e1fccd65307b09e2c
+GitCommit: 1aa2d6b7d29531b6ab43d1bd6912745d2d522674
Directory: 28/windows/windowsservercore-ltsc2025
Builder: classic
Constraints: windowsservercore-ltsc2025
-
-Tags: 28.2.0-rc.2-cli, 28-rc-cli, rc-cli, 28.2.0-rc.2-cli-alpine3.21
-Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: e3927bb31eb6732adf3837a3e99200fb63b55f66
-Directory: 28-rc/cli
-
-Tags: 28.2.0-rc.2-dind, 28-rc-dind, rc-dind, 28.2.0-rc.2-dind-alpine3.21, 28.2.0-rc.2, 28-rc, rc, 28.2.0-rc.2-alpine3.21
-Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: e3927bb31eb6732adf3837a3e99200fb63b55f66
-Directory: 28-rc/dind
-
-Tags: 28.2.0-rc.2-dind-rootless, 28-rc-dind-rootless, rc-dind-rootless
-Architectures: amd64, arm64v8
-GitCommit: e3927bb31eb6732adf3837a3e99200fb63b55f66
-Directory: 28-rc/dind-rootless
-
-Tags: 28.2.0-rc.2-windowsservercore-1809, 28-rc-windowsservercore-1809, rc-windowsservercore-1809
-SharedTags: 28.2.0-rc.2-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
-Architectures: windows-amd64
-GitCommit: e3927bb31eb6732adf3837a3e99200fb63b55f66
-Directory: 28-rc/windows/windowsservercore-1809
-Builder: classic
-Constraints: windowsservercore-1809
-
-Tags: 28.2.0-rc.2-windowsservercore-ltsc2022, 28-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
-SharedTags: 28.2.0-rc.2-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
-Architectures: windows-amd64
-GitCommit: e3927bb31eb6732adf3837a3e99200fb63b55f66
-Directory: 28-rc/windows/windowsservercore-ltsc2022
-Builder: classic
-Constraints: windowsservercore-ltsc2022
-
-Tags: 28.2.0-rc.2-windowsservercore-ltsc2025, 28-rc-windowsservercore-ltsc2025, rc-windowsservercore-ltsc2025
-SharedTags: 28.2.0-rc.2-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
-Architectures: windows-amd64
-GitCommit: e3927bb31eb6732adf3837a3e99200fb63b55f66
-Directory: 28-rc/windows/windowsservercore-ltsc2025
-Builder: classic
-Constraints: windowsservercore-ltsc2025
diff --git a/_bashbrew-list b/_bashbrew-list
index 0f60d70..5eaec2c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,60 +2,33 @@ 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-1809
-docker:28-rc-windowsservercore-ltsc2022
-docker:28-rc-windowsservercore-ltsc2025
docker:28-windowsservercore
docker:28-windowsservercore-1809
docker:28-windowsservercore-ltsc2022
docker:28-windowsservercore-ltsc2025
-docker:28.1
-docker:28.1-cli
-docker:28.1-dind
-docker:28.1-dind-rootless
-docker:28.1-windowsservercore
-docker:28.1-windowsservercore-1809
-docker:28.1-windowsservercore-ltsc2022
-docker:28.1-windowsservercore-ltsc2025
-docker:28.1.1
-docker:28.1.1-alpine3.21
-docker:28.1.1-cli
-docker:28.1.1-cli-alpine3.21
-docker:28.1.1-dind
-docker:28.1.1-dind-alpine3.21
-docker:28.1.1-dind-rootless
-docker:28.1.1-windowsservercore
-docker:28.1.1-windowsservercore-1809
-docker:28.1.1-windowsservercore-ltsc2022
-docker:28.1.1-windowsservercore-ltsc2025
-docker:28.2.0-rc.2
-docker:28.2.0-rc.2-alpine3.21
-docker:28.2.0-rc.2-cli
-docker:28.2.0-rc.2-cli-alpine3.21
-docker:28.2.0-rc.2-dind
-docker:28.2.0-rc.2-dind-alpine3.21
-docker:28.2.0-rc.2-dind-rootless
-docker:28.2.0-rc.2-windowsservercore
-docker:28.2.0-rc.2-windowsservercore-1809
-docker:28.2.0-rc.2-windowsservercore-ltsc2022
-docker:28.2.0-rc.2-windowsservercore-ltsc2025
+docker:28.2
+docker:28.2-cli
+docker:28.2-dind
+docker:28.2-dind-rootless
+docker:28.2-windowsservercore
+docker:28.2-windowsservercore-1809
+docker:28.2-windowsservercore-ltsc2022
+docker:28.2-windowsservercore-ltsc2025
+docker:28.2.1
+docker:28.2.1-alpine3.21
+docker:28.2.1-cli
+docker:28.2.1-cli-alpine3.21
+docker:28.2.1-dind
+docker:28.2.1-dind-alpine3.21
+docker:28.2.1-dind-rootless
+docker:28.2.1-windowsservercore
+docker:28.2.1-windowsservercore-1809
+docker:28.2.1-windowsservercore-ltsc2022
+docker:28.2.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-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 5c9dfd9..b5ab67a 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,12 +1,6 @@
-docker:28.1.1-cli-alpine3.21
-docker:28.2.0-rc.2-cli-alpine3.21
-docker:rc-windowsservercore-1809
-docker:rc-windowsservercore-ltsc2022
-docker:rc-windowsservercore-ltsc2025
+docker:28.2.1-cli-alpine3.21
docker:windowsservercore-1809
docker:windowsservercore-ltsc2022
docker:windowsservercore-ltsc2025
-docker:28.1.1-alpine3.21
-docker:28.2.0-rc.2-alpine3.21
+docker:28.2.1-alpine3.21
docker:dind-rootless
-docker:rc-dind-rootless
diff --git a/docker_28.2.0-rc.2-alpine3.21/Dockerfile b/docker_28.2.0-rc.2-alpine3.21/Dockerfile
deleted file mode 100644
index 4ce2c36..0000000
diff --git a/docker_28.2.0-rc.2-alpine3.21/dockerd-entrypoint.sh b/docker_28.2.0-rc.2-alpine3.21/dockerd-entrypoint.sh
deleted file mode 100755
index 8a291df..0000000
diff --git a/docker_28.2.0-rc.2-cli-alpine3.21/Dockerfile b/docker_28.2.0-rc.2-cli-alpine3.21/Dockerfile
deleted file mode 100644
index e13db5b..0000000
diff --git a/docker_28.2.0-rc.2-cli-alpine3.21/docker-entrypoint.sh b/docker_28.2.0-rc.2-cli-alpine3.21/docker-entrypoint.sh
deleted file mode 100755
index d41cef8..0000000
diff --git a/docker_28.2.0-rc.2-cli-alpine3.21/modprobe.sh b/docker_28.2.0-rc.2-cli-alpine3.21/modprobe.sh
deleted file mode 100755
index b357d89..0000000
diff --git a/docker_28.1.1-alpine3.21/Dockerfile b/docker_28.2.1-alpine3.21/Dockerfile
similarity index 97%
rename from docker_28.1.1-alpine3.21/Dockerfile
rename to docker_28.2.1-alpine3.21/Dockerfile
index 58a1f6e..c0a21fa 100644
--- a/docker_28.1.1-alpine3.21/Dockerfile
+++ b/docker_28.2.1-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/stable/x86_64/docker-28.1.1.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-28.2.1.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-28.1.1.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-28.2.1.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-28.1.1.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-28.2.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-28.1.1.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-28.2.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_28.1.1-alpine3.21/dockerd-entrypoint.sh b/docker_28.2.1-alpine3.21/dockerd-entrypoint.sh
similarity index 100%
rename from docker_28.1.1-alpine3.21/dockerd-entrypoint.sh
rename to docker_28.2.1-alpine3.21/dockerd-entrypoint.sh
diff --git a/docker_28.1.1-cli-alpine3.21/Dockerfile b/docker_28.2.1-cli-alpine3.21/Dockerfile
similarity index 98%
rename from docker_28.1.1-cli-alpine3.21/Dockerfile
rename to docker_28.2.1-cli-alpine3.21/Dockerfile
index bbcc6e9..bc0ad5d 100644
--- a/docker_28.1.1-cli-alpine3.21/Dockerfile
+++ b/docker_28.2.1-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.1.1
+ENV DOCKER_VERSION 28.2.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.1.1.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-28.2.1.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-28.1.1.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-28.2.1.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-28.1.1.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-28.2.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-28.1.1.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-28.2.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_28.1.1-cli-alpine3.21/docker-entrypoint.sh b/docker_28.2.1-cli-alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from docker_28.1.1-cli-alpine3.21/docker-entrypoint.sh
rename to docker_28.2.1-cli-alpine3.21/docker-entrypoint.sh
diff --git a/docker_28.1.1-cli-alpine3.21/modprobe.sh b/docker_28.2.1-cli-alpine3.21/modprobe.sh
similarity index 100%
rename from docker_28.1.1-cli-alpine3.21/modprobe.sh
rename to docker_28.2.1-cli-alpine3.21/modprobe.sh
diff --git a/docker_dind-rootless/Dockerfile b/docker_dind-rootless/Dockerfile
index 2f42d44..b5c3fe0 100644
--- a/docker_dind-rootless/Dockerfile
+++ b/docker_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/stable/x86_64/docker-rootless-extras-28.1.1.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-28.2.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.1.1.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-28.2.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_rc-dind-rootless/Dockerfile b/docker_rc-dind-rootless/Dockerfile
deleted file mode 100644
index 250f7a9..0000000
diff --git a/docker_rc-windowsservercore-1809/Dockerfile b/docker_rc-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 47a37be..0000000
diff --git a/docker_rc-windowsservercore-ltsc2022/Dockerfile b/docker_rc-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index ff8ff1e..0000000
diff --git a/docker_rc-windowsservercore-ltsc2025/Dockerfile b/docker_rc-windowsservercore-ltsc2025/Dockerfile
deleted file mode 100644
index b25f55f..0000000
diff --git a/docker_windowsservercore-1809/Dockerfile b/docker_windowsservercore-1809/Dockerfile
index 33b16fe..bc22a21 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 28.1.1
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.1.1.zip
+ENV DOCKER_VERSION 28.2.1
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.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-ltsc2022/Dockerfile b/docker_windowsservercore-ltsc2022/Dockerfile
index 4c58243..b1199cf 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 28.1.1
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.1.1.zip
+ENV DOCKER_VERSION 28.2.1
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.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_windowsservercore-ltsc2025/Dockerfile
index d751d03..9e781be 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 28.1.1
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.1.1.zip
+ENV DOCKER_VERSION 28.2.1
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-28.2.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
approved these changes
May 29, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes: