Update docker #18442
Merged
Update docker #18442
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@e5fa4d1: Update 28-rc to compose 2.33.0 - docker-library/docker@2738fa1: Update 27 to compose 2.33.0
Diff for f83662d:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 25ba769..a63ae25 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,7 +4,7 @@ Builder: buildkit
Tags: 27.5.1-cli, 27.5-cli, 27-cli, cli, 27.5.1-cli-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 9af9a06de75a33816897ae7285fcb5104c5d9f83
+GitCommit: 2738fa1f226f9ca12b0202bd2267da2f0817c6ae
Directory: 27/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
@@ -20,7 +20,7 @@ Directory: 27/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
Architectures: windows-amd64
-GitCommit: 9af9a06de75a33816897ae7285fcb5104c5d9f83
+GitCommit: 2738fa1f226f9ca12b0202bd2267da2f0817c6ae
Directory: 27/windows/windowsservercore-1809
Builder: classic
Constraints: windowsservercore-1809
@@ -28,7 +28,7 @@ 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
Architectures: windows-amd64
-GitCommit: 9af9a06de75a33816897ae7285fcb5104c5d9f83
+GitCommit: 2738fa1f226f9ca12b0202bd2267da2f0817c6ae
Directory: 27/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
@@ -36,14 +36,14 @@ 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
Architectures: windows-amd64
-GitCommit: 9af9a06de75a33816897ae7285fcb5104c5d9f83
+GitCommit: 2738fa1f226f9ca12b0202bd2267da2f0817c6ae
Directory: 27/windows/windowsservercore-ltsc2025
Builder: classic
Constraints: windowsservercore-ltsc2025
Tags: 28.0.0-rc.1-cli, 28-rc-cli, rc-cli, 28.0.0-rc.1-cli-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: b329937b7efdb0ef4a6724a461529e36770aecb6
+GitCommit: e5fa4d1b38c5db7ece062ca1353ef43f390f3653
Directory: 28-rc/cli
Tags: 28.0.0-rc.1-dind, 28-rc-dind, rc-dind, 28.0.0-rc.1-dind-alpine3.21, 28.0.0-rc.1, 28-rc, rc, 28.0.0-rc.1-alpine3.21
@@ -59,7 +59,7 @@ Directory: 28-rc/dind-rootless
Tags: 28.0.0-rc.1-windowsservercore-1809, 28-rc-windowsservercore-1809, rc-windowsservercore-1809
SharedTags: 28.0.0-rc.1-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
Architectures: windows-amd64
-GitCommit: b329937b7efdb0ef4a6724a461529e36770aecb6
+GitCommit: e5fa4d1b38c5db7ece062ca1353ef43f390f3653
Directory: 28-rc/windows/windowsservercore-1809
Builder: classic
Constraints: windowsservercore-1809
@@ -67,7 +67,7 @@ Constraints: windowsservercore-1809
Tags: 28.0.0-rc.1-windowsservercore-ltsc2022, 28-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
SharedTags: 28.0.0-rc.1-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
Architectures: windows-amd64
-GitCommit: b329937b7efdb0ef4a6724a461529e36770aecb6
+GitCommit: e5fa4d1b38c5db7ece062ca1353ef43f390f3653
Directory: 28-rc/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
@@ -75,7 +75,7 @@ Constraints: windowsservercore-ltsc2022
Tags: 28.0.0-rc.1-windowsservercore-ltsc2025, 28-rc-windowsservercore-ltsc2025, rc-windowsservercore-ltsc2025
SharedTags: 28.0.0-rc.1-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
Architectures: windows-amd64
-GitCommit: b329937b7efdb0ef4a6724a461529e36770aecb6
+GitCommit: e5fa4d1b38c5db7ece062ca1353ef43f390f3653
Directory: 28-rc/windows/windowsservercore-ltsc2025
Builder: classic
Constraints: windowsservercore-ltsc2025
diff --git a/docker_27.5.1-cli-alpine3.21/Dockerfile b/docker_27.5.1-cli-alpine3.21/Dockerfile
index 353a13a..85048e9 100644
--- a/docker_27.5.1-cli-alpine3.21/Dockerfile
+++ b/docker_27.5.1-cli-alpine3.21/Dockerfile
@@ -103,38 +103,38 @@ RUN set -eux; \
\
docker buildx version
-ENV DOCKER_COMPOSE_VERSION 2.32.4
+ENV DOCKER_COMPOSE_VERSION 2.33.0
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-x86_64'; \
- sha256='ed1917fb54db184192ea9d0717bcd59e3662ea79db48bff36d3475516c480a6b'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-x86_64'; \
+ sha256='6395dbb256db6ea28d5c6695bc9bc33866c07ad1c93792f8d85857f1c21c34ee'; \
;; \
'armhf') \
- url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv6'; \
- sha256='1e9c5c4cbdda569164a067ce9246c3a969bac253192526ffe0d0e3a99a4cbd0a'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv6'; \
+ sha256='360976f92dbf4b575bb9beb2737952709c685d1441eebd90c7eeb63225a44ada'; \
;; \
'armv7') \
- url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv7'; \
- sha256='c12bb3c23db5c409a15dbb13be4b61faa74c881d5db5f8a2816f60c19c35251a'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv7'; \
+ sha256='69c5e0b8764876ef7521b4274eba470d0d6686d3def74e2ba0c216bf2bf6f077'; \
;; \
'aarch64') \
- url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-aarch64'; \
- sha256='0c4591cf3b1ed039adcd803dbbeddf757375fc08c11245b0154135f838495a2f'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-aarch64'; \
+ sha256='03a42a0fc0614ffc3c9ebca521cab75e02c427b68e45e3f6867d9510b9a28818'; \
;; \
'ppc64le') \
- url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-ppc64le'; \
- sha256='23adf27e7637fcb65b37d8a214712c4a83d1a3cbc6be0fefd7b6e5cdfd89cb79'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-ppc64le'; \
+ sha256='3e1c3ba91bbf27c0966ad384a96dbecb867c2cbda4fde929165ca35b99075023'; \
;; \
'riscv64') \
- url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-riscv64'; \
- sha256='392f705e6b1ad99b8bf761f4be8211d531fbacbcad1326f14f1cdcfc68c25a6b'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-riscv64'; \
+ sha256='dffcdfbc88189a97c0000d1995476fa6712396d1472d6fbe24bfb424f46da7c3'; \
;; \
's390x') \
- url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-s390x'; \
- sha256='fe2d32c99c34c39a5156fb3bfb73949be746644a3f887b628bfc971c37fa1b90'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-s390x'; \
+ sha256='3f809fd846e3e38bc3dcb88546f88141a68e1bb4578a74c71ed5b563f95a45bb'; \
;; \
*) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \
esac; \
diff --git a/docker_28.0.0-rc.1-cli-alpine3.21/Dockerfile b/docker_28.0.0-rc.1-cli-alpine3.21/Dockerfile
index 1dfcccc..0682250 100644
--- a/docker_28.0.0-rc.1-cli-alpine3.21/Dockerfile
+++ b/docker_28.0.0-rc.1-cli-alpine3.21/Dockerfile
@@ -103,38 +103,38 @@ RUN set -eux; \
\
docker buildx version
-ENV DOCKER_COMPOSE_VERSION 2.32.4
+ENV DOCKER_COMPOSE_VERSION 2.33.0
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-x86_64'; \
- sha256='ed1917fb54db184192ea9d0717bcd59e3662ea79db48bff36d3475516c480a6b'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-x86_64'; \
+ sha256='6395dbb256db6ea28d5c6695bc9bc33866c07ad1c93792f8d85857f1c21c34ee'; \
;; \
'armhf') \
- url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv6'; \
- sha256='1e9c5c4cbdda569164a067ce9246c3a969bac253192526ffe0d0e3a99a4cbd0a'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv6'; \
+ sha256='360976f92dbf4b575bb9beb2737952709c685d1441eebd90c7eeb63225a44ada'; \
;; \
'armv7') \
- url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv7'; \
- sha256='c12bb3c23db5c409a15dbb13be4b61faa74c881d5db5f8a2816f60c19c35251a'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-armv7'; \
+ sha256='69c5e0b8764876ef7521b4274eba470d0d6686d3def74e2ba0c216bf2bf6f077'; \
;; \
'aarch64') \
- url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-aarch64'; \
- sha256='0c4591cf3b1ed039adcd803dbbeddf757375fc08c11245b0154135f838495a2f'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-aarch64'; \
+ sha256='03a42a0fc0614ffc3c9ebca521cab75e02c427b68e45e3f6867d9510b9a28818'; \
;; \
'ppc64le') \
- url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-ppc64le'; \
- sha256='23adf27e7637fcb65b37d8a214712c4a83d1a3cbc6be0fefd7b6e5cdfd89cb79'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-ppc64le'; \
+ sha256='3e1c3ba91bbf27c0966ad384a96dbecb867c2cbda4fde929165ca35b99075023'; \
;; \
'riscv64') \
- url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-riscv64'; \
- sha256='392f705e6b1ad99b8bf761f4be8211d531fbacbcad1326f14f1cdcfc68c25a6b'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-riscv64'; \
+ sha256='dffcdfbc88189a97c0000d1995476fa6712396d1472d6fbe24bfb424f46da7c3'; \
;; \
's390x') \
- url='https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-s390x'; \
- sha256='fe2d32c99c34c39a5156fb3bfb73949be746644a3f887b628bfc971c37fa1b90'; \
+ url='https://github.com/docker/compose/releases/download/v2.33.0/docker-compose-linux-s390x'; \
+ sha256='3f809fd846e3e38bc3dcb88546f88141a68e1bb4578a74c71ed5b563f95a45bb'; \
;; \
*) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \
esac; \
diff --git a/docker_rc-windowsservercore-1809/Dockerfile b/docker_rc-windowsservercore-1809/Dockerfile
index ae5f346..e21a101 100644
--- a/docker_rc-windowsservercore-1809/Dockerfile
+++ b/docker_rc-windowsservercore-1809/Dockerfile
@@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
docker buildx version; \
\
Write-Host 'Complete.';
-ENV DOCKER_COMPOSE_VERSION 2.32.4
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd
+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
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-ltsc2022/Dockerfile b/docker_rc-windowsservercore-ltsc2022/Dockerfile
index e1391c2..84a8813 100644
--- a/docker_rc-windowsservercore-ltsc2022/Dockerfile
+++ b/docker_rc-windowsservercore-ltsc2022/Dockerfile
@@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
docker buildx version; \
\
Write-Host 'Complete.';
-ENV DOCKER_COMPOSE_VERSION 2.32.4
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd
+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
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 fd9ad9c..c6fa387 100644
--- a/docker_rc-windowsservercore-ltsc2025/Dockerfile
+++ b/docker_rc-windowsservercore-ltsc2025/Dockerfile
@@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
docker buildx version; \
\
Write-Host 'Complete.';
-ENV DOCKER_COMPOSE_VERSION 2.32.4
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd
+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
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-1809/Dockerfile b/docker_windowsservercore-1809/Dockerfile
index 1b7c45e..fb641c0 100644
--- a/docker_windowsservercore-1809/Dockerfile
+++ b/docker_windowsservercore-1809/Dockerfile
@@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
docker buildx version; \
\
Write-Host 'Complete.';
-ENV DOCKER_COMPOSE_VERSION 2.32.4
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd
+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
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 60b9f4b..7d5b2a9 100644
--- a/docker_windowsservercore-ltsc2022/Dockerfile
+++ b/docker_windowsservercore-ltsc2022/Dockerfile
@@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
docker buildx version; \
\
Write-Host 'Complete.';
-ENV DOCKER_COMPOSE_VERSION 2.32.4
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd
+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
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 338d2f4..314cdbb 100644
--- a/docker_windowsservercore-ltsc2025/Dockerfile
+++ b/docker_windowsservercore-ltsc2025/Dockerfile
@@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
docker buildx version; \
\
Write-Host 'Complete.';
-ENV DOCKER_COMPOSE_VERSION 2.32.4
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 5df58bb738c7ac2712c031e15154b49f32f4026640d8c0539090d6e0a66d6dfd
+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
RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
Write-Host ('Creating {0} ...' -f $dir); \
New-Item -ItemType Directory $dir -Force; \Relevant Maintainers: |
|
LaurentGoderre
approved these changes
Feb 12, 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: