Skip to content
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

Update docker #18252

Merged
merged 1 commit into from
Jan 17, 2025
Merged

Update docker #18252

merged 1 commit into from
Jan 17, 2025

Conversation

tianon
Copy link
Member

@tianon tianon commented Jan 16, 2025

Changes:

Changes:

- docker-library/docker@188ce9e: Update 27 to compose 2.32.4
Copy link

Diff for 666c403:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 5d984e8..798e376 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,7 +4,7 @@ Builder: buildkit
 
 Tags: 27.5.0-cli, 27.5-cli, 27-cli, cli, 27.5.0-cli-alpine3.21
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 49e7a0aa907a6033c2482efbf8e25bb97588b184
+GitCommit: 188ce9e3ab5fe4aff074273041d4532fa870723d
 Directory: 27/cli
 
 Tags: 27.5.0-dind, 27.5-dind, 27-dind, dind, 27.5.0-dind-alpine3.21, 27.5.0, 27.5, 27, latest, 27.5.0-alpine3.21
@@ -20,7 +20,7 @@ Directory: 27/dind-rootless
 Tags: 27.5.0-windowsservercore-1809, 27.5-windowsservercore-1809, 27-windowsservercore-1809, windowsservercore-1809
 SharedTags: 27.5.0-windowsservercore, 27.5-windowsservercore, 27-windowsservercore, windowsservercore
 Architectures: windows-amd64
-GitCommit: 49e7a0aa907a6033c2482efbf8e25bb97588b184
+GitCommit: 188ce9e3ab5fe4aff074273041d4532fa870723d
 Directory: 27/windows/windowsservercore-1809
 Builder: classic
 Constraints: windowsservercore-1809
@@ -28,7 +28,7 @@ Constraints: windowsservercore-1809
 Tags: 27.5.0-windowsservercore-ltsc2022, 27.5-windowsservercore-ltsc2022, 27-windowsservercore-ltsc2022, windowsservercore-ltsc2022
 SharedTags: 27.5.0-windowsservercore, 27.5-windowsservercore, 27-windowsservercore, windowsservercore
 Architectures: windows-amd64
-GitCommit: 49e7a0aa907a6033c2482efbf8e25bb97588b184
+GitCommit: 188ce9e3ab5fe4aff074273041d4532fa870723d
 Directory: 27/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
diff --git a/docker_27.5.0-cli-alpine3.21/Dockerfile b/docker_27.5.0-cli-alpine3.21/Dockerfile
index 2c99a95..a72bc9e 100644
--- a/docker_27.5.0-cli-alpine3.21/Dockerfile
+++ b/docker_27.5.0-cli-alpine3.21/Dockerfile
@@ -103,38 +103,38 @@ RUN set -eux; \
 	\
 	docker buildx version
 
-ENV DOCKER_COMPOSE_VERSION 2.32.3
+ENV DOCKER_COMPOSE_VERSION 2.32.4
 RUN set -eux; \
 	\
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='/~https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-x86_64'; \
-			sha256='6ef48e4bf25fbf1f1ad50c43b797cc24e12e4cde29765076b4145e09e35f5713'; \
+			url='/~https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-x86_64'; \
+			sha256='ed1917fb54db184192ea9d0717bcd59e3662ea79db48bff36d3475516c480a6b'; \
 			;; \
 		'armhf') \
-			url='/~https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv6'; \
-			sha256='8f415a76ad62ff621b26b37a94841ee0d4480862d8da55320c1c8fc9db4d8359'; \
+			url='/~https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv6'; \
+			sha256='1e9c5c4cbdda569164a067ce9246c3a969bac253192526ffe0d0e3a99a4cbd0a'; \
 			;; \
 		'armv7') \
-			url='/~https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-armv7'; \
-			sha256='64314c73a7d34e4a8b9dad87bab857304fb60b0293703d02be436893e1c37f33'; \
+			url='/~https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-armv7'; \
+			sha256='c12bb3c23db5c409a15dbb13be4b61faa74c881d5db5f8a2816f60c19c35251a'; \
 			;; \
 		'aarch64') \
-			url='/~https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-aarch64'; \
-			sha256='d1a04a3eb7fd738cc78e518d179a03adb9fe531ee422b8a14bdccf36d654b73a'; \
+			url='/~https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-aarch64'; \
+			sha256='0c4591cf3b1ed039adcd803dbbeddf757375fc08c11245b0154135f838495a2f'; \
 			;; \
 		'ppc64le') \
-			url='/~https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-ppc64le'; \
-			sha256='23bddc8119bce6c0eeef1461bc0526291d60de9042b28780012033ba4082090e'; \
+			url='/~https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-ppc64le'; \
+			sha256='23adf27e7637fcb65b37d8a214712c4a83d1a3cbc6be0fefd7b6e5cdfd89cb79'; \
 			;; \
 		'riscv64') \
-			url='/~https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-riscv64'; \
-			sha256='c4bac574a2123938de4ef410e7cef92d079abe266298c93257cbcc4e17134184'; \
+			url='/~https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-riscv64'; \
+			sha256='392f705e6b1ad99b8bf761f4be8211d531fbacbcad1326f14f1cdcfc68c25a6b'; \
 			;; \
 		's390x') \
-			url='/~https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-linux-s390x'; \
-			sha256='6c0c7d9b6119f68b3dcbf816cf9e5782eb7cea8d2433f8a51b95a41276241e18'; \
+			url='/~https://github.com/docker/compose/releases/download/v2.32.4/docker-compose-linux-s390x'; \
+			sha256='fe2d32c99c34c39a5156fb3bfb73949be746644a3f887b628bfc971c37fa1b90'; \
 			;; \
 		*) 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 dcee4f2..53940c5 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.3
-ENV DOCKER_COMPOSE_URL /~https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 67a0c3ca2fd94c74982917c8bdf54465367fc3a8c0cb17c529eb6525d32b1674
+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
 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 6b95d96..96584f8 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.3
-ENV DOCKER_COMPOSE_URL /~https://github.com/docker/compose/releases/download/v2.32.3/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 67a0c3ca2fd94c74982917c8bdf54465367fc3a8c0cb17c529eb6525d32b1674
+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
 RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
 	Write-Host ('Creating {0} ...' -f $dir); \
 	New-Item -ItemType Directory $dir -Force; \

Relevant Maintainers:

@yosifkit yosifkit merged commit 81bb990 into docker-library:master Jan 17, 2025
8 checks passed
@yosifkit yosifkit deleted the docker branch January 17, 2025 00:06
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