Update docker #18504
Merged
Update docker #18504
Conversation
This file contains 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@c9e1447: Update 28 to buildx 0.21.1, compose 2.33.1
Diff for 37065e3:diff --git a/_bashbrew-cat b/_bashbrew-cat
index b150a68..45f9caa 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,7 +4,7 @@ Builder: buildkit
Tags: 28.0.0-cli, 28.0-cli, 28-cli, cli, 28.0.0-cli-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 35c016d0c0f0be4dc523bc1108d7fa2681db8306
+GitCommit: c9e1447b8f26065eb1dccb70ab88e62ee6c2085d
Directory: 28/cli
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
@@ -20,7 +20,7 @@ Directory: 28/dind-rootless
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: 35c016d0c0f0be4dc523bc1108d7fa2681db8306
+GitCommit: c9e1447b8f26065eb1dccb70ab88e62ee6c2085d
Directory: 28/windows/windowsservercore-1809
Builder: classic
Constraints: windowsservercore-1809
@@ -28,7 +28,7 @@ Constraints: windowsservercore-1809
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: 35c016d0c0f0be4dc523bc1108d7fa2681db8306
+GitCommit: c9e1447b8f26065eb1dccb70ab88e62ee6c2085d
Directory: 28/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
@@ -36,7 +36,7 @@ Constraints: windowsservercore-ltsc2022
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: 35c016d0c0f0be4dc523bc1108d7fa2681db8306
+GitCommit: c9e1447b8f26065eb1dccb70ab88e62ee6c2085d
Directory: 28/windows/windowsservercore-ltsc2025
Builder: classic
Constraints: windowsservercore-ltsc2025
diff --git a/docker_28.0.0-cli-alpine3.21/Dockerfile b/docker_28.0.0-cli-alpine3.21/Dockerfile
index 2044000..9e867a2 100644
--- a/docker_28.0.0-cli-alpine3.21/Dockerfile
+++ b/docker_28.0.0-cli-alpine3.21/Dockerfile
@@ -57,38 +57,38 @@ RUN set -eux; \
\
docker --version
-ENV DOCKER_BUILDX_VERSION 0.21.0
+ENV DOCKER_BUILDX_VERSION 0.21.1
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-amd64'; \
- sha256='90f154aff1b1b0010ca3e59f473a59a86b5fdf34ca1196829c622c4fbf5e92fe'; \
+ url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-amd64'; \
+ sha256='7f355525bfaf411302570b705118181b720f18071f4be3f0eaac7b2297d826e2'; \
;; \
'armhf') \
- url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v6'; \
- sha256='1a55ed189ee5c58b3d78459cf81d023a135a759c5ea3b7d1e2ad587cdfabac15'; \
+ url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-arm-v6'; \
+ sha256='f841251fd67646e8b6bb4c7e0c2c385f6a1dc7403f5ac6ee7b07c96f0815f7f3'; \
;; \
'armv7') \
- url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm-v7'; \
- sha256='542676a5aa32ecfcfcb27c56a0c8d91af42614ed5c0266e91ed0b55d90a15555'; \
+ url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-arm-v7'; \
+ sha256='81d7040e90e9b69cb0378778f673e1fc2a24ef6dbd47931dc83ab6472fc5809d'; \
;; \
'aarch64') \
- url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-arm64'; \
- sha256='5543113b559ca523726c8979defa24466e451dbfa6ffe42c278d22a3f76a327a'; \
+ url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-arm64'; \
+ sha256='42d5cee287ec7426de5252276a05f3ea565ac2d65d62d052b885a84dd54152d5'; \
;; \
'ppc64le') \
- url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-ppc64le'; \
- sha256='90c2748b59d0588cbd006e209ce8cecf202319213eba6542d01a5ce2f5c06f6e'; \
+ url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-ppc64le'; \
+ sha256='6a4e6a243f83d80cd46c939f327b2e14cfddd2c6690651cf48d0e208c3345b88'; \
;; \
'riscv64') \
- url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-riscv64'; \
- sha256='84148bbc57023004b186bf1ba618f987d9df51d3b588876bfc04f7a592fb9bc0'; \
+ url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-riscv64'; \
+ sha256='eae82aec74a420c3d1734123e6a3bc10b3a2a981aa1d538502373e31c91bf76e'; \
;; \
's390x') \
- url='https://github.com/docker/buildx/releases/download/v0.21.0/buildx-v0.21.0.linux-s390x'; \
- sha256='541b0fe136f003db4e0e5e4e3ec4ae00a647b50d398e7f63201d1ea712218132'; \
+ url='https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.linux-s390x'; \
+ sha256='97b112b3366a471cc375e0f881d65a9a7b07f0962f308834c37f5c3fa75aad08'; \
;; \
*) echo >&2 "warning: unsupported 'docker-buildx' architecture ($apkArch); skipping"; exit 0 ;; \
esac; \
@@ -103,38 +103,38 @@ RUN set -eux; \
\
docker buildx version
-ENV DOCKER_COMPOSE_VERSION 2.33.0
+ENV DOCKER_COMPOSE_VERSION 2.33.1
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-x86_64'; \
- sha256='6395dbb256db6ea28d5c6695bc9bc33866c07ad1c93792f8d85857f1c21c34ee'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-x86_64'; \
+ sha256='3efda1ad6caed49dedd5644cadbf7e0c9cc3d74d8844ca5237b6a43ac1ef1a46'; \
;; \
'armhf') \
- url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv6'; \
- sha256='360976f92dbf4b575bb9beb2737952709c685d1441eebd90c7eeb63225a44ada'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-armv6'; \
+ sha256='17e66154ed90d43d4c26dec4a77caeaa6f0a8337f436cc4bffecbc2fd9bcd27d'; \
;; \
'armv7') \
- url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv7'; \
- sha256='69c5e0b8764876ef7521b4274eba470d0d6686d3def74e2ba0c216bf2bf6f077'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-armv7'; \
+ sha256='0104e689d29597352a715f7027205d7517f17f449ffe14099aa9d5d0a54f7073'; \
;; \
'aarch64') \
- url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-aarch64'; \
- sha256='03a42a0fc0614ffc3c9ebca521cab75e02c427b68e45e3f6867d9510b9a28818'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-aarch64'; \
+ sha256='fa0e077510c852237b0da426d0daf6853446e7760145ce7665ec401892a4d0de'; \
;; \
'ppc64le') \
- url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-ppc64le'; \
- sha256='3e1c3ba91bbf27c0966ad384a96dbecb867c2cbda4fde929165ca35b99075023'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-ppc64le'; \
+ sha256='79d874b04c972475867e2e1f69febdadc446289af32afaa0dcb99f48a25380cc'; \
;; \
'riscv64') \
- url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-riscv64'; \
- sha256='dffcdfbc88189a97c0000d1995476fa6712396d1472d6fbe24bfb424f46da7c3'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-riscv64'; \
+ sha256='8a51f33cb82afc6b7ce1c02b3161ce928387e96efa7b838e2f9f1fa554d68781'; \
;; \
's390x') \
- url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-s390x'; \
- sha256='3f809fd846e3e38bc3dcb88546f88141a68e1bb4578a74c71ed5b563f95a45bb'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-linux-s390x'; \
+ sha256='bae7fd067dd05951e4c6cb66199d2e7f388b5c19856db760fe4253dfdf2a008e'; \
;; \
*) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \
esac; \
diff --git a/docker_windowsservercore-1809/Dockerfile b/docker_windowsservercore-1809/Dockerfile
index 4d1a6f8..547a05f 100644
--- a/docker_windowsservercore-1809/Dockerfile
+++ b/docker_windowsservercore-1809/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.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
+ENV DOCKER_BUILDX_VERSION 0.21.1
+ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.windows-amd64.exe
+ENV DOCKER_BUILDX_SHA256 ab3eba3acbfa6b6612690af075795254f29762efc8abace5f636b8e7628b1851
RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
Write-Host ('Creating {0} ...' -f $dir); \
New-Item -ItemType Directory $dir -Force; \
@@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
docker buildx version; \
\
Write-Host 'Complete.';
-ENV DOCKER_COMPOSE_VERSION 2.33.0
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83
+ENV DOCKER_COMPOSE_VERSION 2.33.1
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 01bce3456228d8e1e4b0ba056f4b9730b7fd2c1a7113c8a985144c0fdee797b0
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 38f43b5..8c2ab47 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.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
+ENV DOCKER_BUILDX_VERSION 0.21.1
+ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.windows-amd64.exe
+ENV DOCKER_BUILDX_SHA256 ab3eba3acbfa6b6612690af075795254f29762efc8abace5f636b8e7628b1851
RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
Write-Host ('Creating {0} ...' -f $dir); \
New-Item -ItemType Directory $dir -Force; \
@@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
docker buildx version; \
\
Write-Host 'Complete.';
-ENV DOCKER_COMPOSE_VERSION 2.33.0
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83
+ENV DOCKER_COMPOSE_VERSION 2.33.1
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 01bce3456228d8e1e4b0ba056f4b9730b7fd2c1a7113c8a985144c0fdee797b0
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 f5a76b3..ce76da3 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.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
+ENV DOCKER_BUILDX_VERSION 0.21.1
+ENV DOCKER_BUILDX_URL https://github.com/docker/buildx/releases/download/v0.21.1/buildx-v0.21.1.windows-amd64.exe
+ENV DOCKER_BUILDX_SHA256 ab3eba3acbfa6b6612690af075795254f29762efc8abace5f636b8e7628b1851
RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
Write-Host ('Creating {0} ...' -f $dir); \
New-Item -ItemType Directory $dir -Force; \
@@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
docker buildx version; \
\
Write-Host 'Complete.';
-ENV DOCKER_COMPOSE_VERSION 2.33.0
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 1324e382e1a79efaee4be288aae847f8a2862acf270d5621c17dff3a10d5ee83
+ENV DOCKER_COMPOSE_VERSION 2.33.1
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.33.1/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 01bce3456228d8e1e4b0ba056f4b9730b7fd2c1a7113c8a985144c0fdee797b0
RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
Write-Host ('Creating {0} ...' -f $dir); \
New-Item -ItemType Directory $dir -Force; \Relevant Maintainers: |
|
Windows 2025 failure is #18435 (comment):
|
yosifkit
approved these changes
Feb 21, 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: