-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Update docker #19290
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 #19290
+6
−6
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@c90609c: Update 28-rc to buildx 0.25.0 - docker-library/docker@689bb25: Update 28 to buildx 0.25.0
Diff for 1a44753:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 74d0af6..20ae6ed 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,7 +4,7 @@ Builder: buildkit
Tags: 28.2.2-cli, 28.2-cli, 28-cli, cli, 28.2.2-cli-alpine3.22
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 46b52b3a685ae16281bb08c1df1622f0a5b3ae24
+GitCommit: 689bb251b0f0110dd24f306d9eacafd27826a412
Directory: 28/cli
Tags: 28.2.2-dind, 28.2-dind, 28-dind, dind, 28.2.2-dind-alpine3.22, 28.2.2, 28.2, 28, latest, 28.2.2-alpine3.22
@@ -20,7 +20,7 @@ Directory: 28/dind-rootless
Tags: 28.2.2-windowsservercore-ltsc2022, 28.2-windowsservercore-ltsc2022, 28-windowsservercore-ltsc2022, windowsservercore-ltsc2022
SharedTags: 28.2.2-windowsservercore, 28.2-windowsservercore, 28-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 46b52b3a685ae16281bb08c1df1622f0a5b3ae24
+GitCommit: 689bb251b0f0110dd24f306d9eacafd27826a412
Directory: 28/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
@@ -28,14 +28,14 @@ Constraints: windowsservercore-ltsc2022
Tags: 28.2.2-windowsservercore-ltsc2025, 28.2-windowsservercore-ltsc2025, 28-windowsservercore-ltsc2025, windowsservercore-ltsc2025
SharedTags: 28.2.2-windowsservercore, 28.2-windowsservercore, 28-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 46b52b3a685ae16281bb08c1df1622f0a5b3ae24
+GitCommit: 689bb251b0f0110dd24f306d9eacafd27826a412
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
+GitCommit: c90609cf2ae49f9d87aec68d9ce5eb39c0cb868d
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
@@ -51,7 +51,7 @@ 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
+GitCommit: c90609cf2ae49f9d87aec68d9ce5eb39c0cb868d
Directory: 28-rc/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
@@ -59,7 +59,7 @@ 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
+GitCommit: c90609cf2ae49f9d87aec68d9ce5eb39c0cb868d
Directory: 28-rc/windows/windowsservercore-ltsc2025
Builder: classic
Constraints: windowsservercore-ltsc2025
diff --git a/docker_28.2.2-cli-alpine3.22/Dockerfile b/docker_28.2.2-cli-alpine3.22/Dockerfile
index 4160d1a..336b445 100644
--- a/docker_28.2.2-cli-alpine3.22/Dockerfile
+++ b/docker_28.2.2-cli-alpine3.22/Dockerfile
@@ -57,38 +57,38 @@ RUN set -eux; \
\
docker --version
-ENV DOCKER_BUILDX_VERSION 0.24.0
+ENV DOCKER_BUILDX_VERSION 0.25.0
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-amd64'; \
- sha256='c41ed17ec05b6ebb50eeb02fb26cce90f16cd260b8d26ce73963428c6b2d6508'; \
+ url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-amd64'; \
+ sha256='4104d79a791a8744c0b43fd5bd0a6172dff29040c5229946a1cdb2d27b0b5bfa'; \
;; \
'armhf') \
- url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v6'; \
- sha256='591abb51afe942814a45f4f3d0f1a97fe8c5c212142bded66025ae019136bac8'; \
+ url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v6'; \
+ sha256='4b92125aa797875108174d9d8ae2e92bdf1db82c97dcf8b3bb72490a62fd8122'; \
;; \
'armv7') \
- url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v7'; \
- sha256='69a3afa3d22867ea67b87e5f205574478e7a795599c471b61575bacf455452ae'; \
+ url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v7'; \
+ sha256='0c943fa7001cde147ab7663e36c92259ddde2a3ce0b6f5dfcbc3535dc67f8661'; \
;; \
'aarch64') \
- url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm64'; \
- sha256='ad33819d085a635e3b4400a412bd2b4e943bfbc830366d78f50579bae48f8053'; \
+ url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm64'; \
+ sha256='f07063844bb750172c1f25cef61b07a8314d24bedffc015517b3ec4016b16de8'; \
;; \
'ppc64le') \
- url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-ppc64le'; \
- sha256='90c02625d1e52abd8e6089854208963651ea727028aaca58b29847dc594c01f8'; \
+ url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-ppc64le'; \
+ sha256='9ac89d1401b105be41e98760aaaae00e4f44e180e757bf6044d2824ff14788bf'; \
;; \
'riscv64') \
- url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-riscv64'; \
- sha256='3031cf533e015ea77425446e4bc87173f1316447ed3369c2898f73ac353de404'; \
+ url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-riscv64'; \
+ sha256='17829ab06c8ec984201170bfb676e6cd311312983814354505fb679b36c02177'; \
;; \
's390x') \
- url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-s390x'; \
- sha256='821ea62254a7be6cab51c5ebefc9ba74b7e2dd902c78d16b268850dc29869ca2'; \
+ url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-s390x'; \
+ sha256='1b4a7d86fee5b6a48fd153418bd6ed8f0c82bc5d7eb3b219052e834ece977440'; \
;; \
*) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \
esac; \
diff --git a/docker_28.3.0-rc.1-cli-alpine3.22/Dockerfile b/docker_28.3.0-rc.1-cli-alpine3.22/Dockerfile
index f8ba30f..ddf3b9a 100644
--- a/docker_28.3.0-rc.1-cli-alpine3.22/Dockerfile
+++ b/docker_28.3.0-rc.1-cli-alpine3.22/Dockerfile
@@ -57,38 +57,38 @@ RUN set -eux; \
\
docker --version
-ENV DOCKER_BUILDX_VERSION 0.24.0
+ENV DOCKER_BUILDX_VERSION 0.25.0
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-amd64'; \
- sha256='c41ed17ec05b6ebb50eeb02fb26cce90f16cd260b8d26ce73963428c6b2d6508'; \
+ url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-amd64'; \
+ sha256='4104d79a791a8744c0b43fd5bd0a6172dff29040c5229946a1cdb2d27b0b5bfa'; \
;; \
'armhf') \
- url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v6'; \
- sha256='591abb51afe942814a45f4f3d0f1a97fe8c5c212142bded66025ae019136bac8'; \
+ url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v6'; \
+ sha256='4b92125aa797875108174d9d8ae2e92bdf1db82c97dcf8b3bb72490a62fd8122'; \
;; \
'armv7') \
- url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm-v7'; \
- sha256='69a3afa3d22867ea67b87e5f205574478e7a795599c471b61575bacf455452ae'; \
+ url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm-v7'; \
+ sha256='0c943fa7001cde147ab7663e36c92259ddde2a3ce0b6f5dfcbc3535dc67f8661'; \
;; \
'aarch64') \
- url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-arm64'; \
- sha256='ad33819d085a635e3b4400a412bd2b4e943bfbc830366d78f50579bae48f8053'; \
+ url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-arm64'; \
+ sha256='f07063844bb750172c1f25cef61b07a8314d24bedffc015517b3ec4016b16de8'; \
;; \
'ppc64le') \
- url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-ppc64le'; \
- sha256='90c02625d1e52abd8e6089854208963651ea727028aaca58b29847dc594c01f8'; \
+ url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-ppc64le'; \
+ sha256='9ac89d1401b105be41e98760aaaae00e4f44e180e757bf6044d2824ff14788bf'; \
;; \
'riscv64') \
- url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-riscv64'; \
- sha256='3031cf533e015ea77425446e4bc87173f1316447ed3369c2898f73ac353de404'; \
+ url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-riscv64'; \
+ sha256='17829ab06c8ec984201170bfb676e6cd311312983814354505fb679b36c02177'; \
;; \
's390x') \
- url='https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.linux-s390x'; \
- sha256='821ea62254a7be6cab51c5ebefc9ba74b7e2dd902c78d16b268850dc29869ca2'; \
+ url='https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.linux-s390x'; \
+ sha256='1b4a7d86fee5b6a48fd153418bd6ed8f0c82bc5d7eb3b219052e834ece977440'; \
;; \
*) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \
esac; \
diff --git a/docker_rc-windowsservercore-ltsc2022/Dockerfile b/docker_rc-windowsservercore-ltsc2022/Dockerfile
index 100182f..272c412 100644
--- a/docker_rc-windowsservercore-ltsc2022/Dockerfile
+++ b/docker_rc-windowsservercore-ltsc2022/Dockerfile
@@ -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.24.0
-ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe
-ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140
+ENV DOCKER_BUILDX_VERSION 0.25.0
+ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-amd64.exe
+ENV DOCKER_BUILDX_SHA256 22baed7fdec17b429f4267d3ae388828dfea0c40622ef79ee6fb0a0d08d878fb
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_rc-windowsservercore-ltsc2025/Dockerfile b/docker_rc-windowsservercore-ltsc2025/Dockerfile
index cf25dd1..99c2d78 100644
--- a/docker_rc-windowsservercore-ltsc2025/Dockerfile
+++ b/docker_rc-windowsservercore-ltsc2025/Dockerfile
@@ -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.24.0
-ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe
-ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140
+ENV DOCKER_BUILDX_VERSION 0.25.0
+ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-amd64.exe
+ENV DOCKER_BUILDX_SHA256 22baed7fdec17b429f4267d3ae388828dfea0c40622ef79ee6fb0a0d08d878fb
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 ba587f1..45d6dc9 100644
--- a/docker_windowsservercore-ltsc2022/Dockerfile
+++ b/docker_windowsservercore-ltsc2022/Dockerfile
@@ -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.24.0
-ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe
-ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140
+ENV DOCKER_BUILDX_VERSION 0.25.0
+ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-amd64.exe
+ENV DOCKER_BUILDX_SHA256 22baed7fdec17b429f4267d3ae388828dfea0c40622ef79ee6fb0a0d08d878fb
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 e46c0c3..764970a 100644
--- a/docker_windowsservercore-ltsc2025/Dockerfile
+++ b/docker_windowsservercore-ltsc2025/Dockerfile
@@ -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.24.0
-ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.24.0/buildx-v0.24.0.windows-amd64.exe
-ENV DOCKER_BUILDX_SHA256 8dec102c8eb14f434707cc05a8f0e366c090ded6ad74d9c5f8a64a9c0b766140
+ENV DOCKER_BUILDX_VERSION 0.25.0
+ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.25.0/buildx-v0.25.0.windows-amd64.exe
+ENV DOCKER_BUILDX_SHA256 22baed7fdec17b429f4267d3ae388828dfea0c40622ef79ee6fb0a0d08d878fb
RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
Write-Host ('Creating {0} ...' -f $dir); \
New-Item -ItemType Directory $dir -Force; \ Relevant Maintainers: |
tianon
approved these changes
Jun 18, 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: