Update docker #17575
Merged
Update docker #17575
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@99372b0: Update 27-rc to compose 2.29.5 - docker-library/docker@c5f5109: Update 27 to compose 2.29.5
Diff for d415e21:diff --git a/_bashbrew-cat b/_bashbrew-cat
index c2252a0..7a2ae21 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,7 +4,7 @@ Builder: buildkit
Tags: 27.2.1-cli, 27.2-cli, 27-cli, cli, 27.2.1-cli-alpine3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 12866bea2a3c9b95cb39f79e62537123a2ab96bb
+GitCommit: c5f51099b9d89dfd55d60d40b1ecba94da8ad364
Directory: 27/cli
Tags: 27.2.1-dind, 27.2-dind, 27-dind, dind, 27.2.1-dind-alpine3.20, 27.2.1, 27.2, 27, latest, 27.2.1-alpine3.20
@@ -20,7 +20,7 @@ Directory: 27/dind-rootless
Tags: 27.2.1-windowsservercore-1809, 27.2-windowsservercore-1809, 27-windowsservercore-1809, windowsservercore-1809
SharedTags: 27.2.1-windowsservercore, 27.2-windowsservercore, 27-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 12866bea2a3c9b95cb39f79e62537123a2ab96bb
+GitCommit: c5f51099b9d89dfd55d60d40b1ecba94da8ad364
Directory: 27/windows/windowsservercore-1809
Builder: classic
Constraints: windowsservercore-1809
@@ -28,14 +28,14 @@ Constraints: windowsservercore-1809
Tags: 27.2.1-windowsservercore-ltsc2022, 27.2-windowsservercore-ltsc2022, 27-windowsservercore-ltsc2022, windowsservercore-ltsc2022
SharedTags: 27.2.1-windowsservercore, 27.2-windowsservercore, 27-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 12866bea2a3c9b95cb39f79e62537123a2ab96bb
+GitCommit: c5f51099b9d89dfd55d60d40b1ecba94da8ad364
Directory: 27/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
Tags: 27.3.0-rc.1-cli, 27-rc-cli, rc-cli, 27.3.0-rc.1-cli-alpine3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 99ff91579f4ce09b5ae78bdbc1de20c4c11ca7a7
+GitCommit: 99372b0dca1bacabe5af124932b9017526068dad
Directory: 27-rc/cli
Tags: 27.3.0-rc.1-dind, 27-rc-dind, rc-dind, 27.3.0-rc.1-dind-alpine3.20, 27.3.0-rc.1, 27-rc, rc, 27.3.0-rc.1-alpine3.20
@@ -51,7 +51,7 @@ Directory: 27-rc/dind-rootless
Tags: 27.3.0-rc.1-windowsservercore-1809, 27-rc-windowsservercore-1809, rc-windowsservercore-1809
SharedTags: 27.3.0-rc.1-windowsservercore, 27-rc-windowsservercore, rc-windowsservercore
Architectures: windows-amd64
-GitCommit: 99ff91579f4ce09b5ae78bdbc1de20c4c11ca7a7
+GitCommit: 99372b0dca1bacabe5af124932b9017526068dad
Directory: 27-rc/windows/windowsservercore-1809
Builder: classic
Constraints: windowsservercore-1809
@@ -59,7 +59,7 @@ Constraints: windowsservercore-1809
Tags: 27.3.0-rc.1-windowsservercore-ltsc2022, 27-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
SharedTags: 27.3.0-rc.1-windowsservercore, 27-rc-windowsservercore, rc-windowsservercore
Architectures: windows-amd64
-GitCommit: 99ff91579f4ce09b5ae78bdbc1de20c4c11ca7a7
+GitCommit: 99372b0dca1bacabe5af124932b9017526068dad
Directory: 27-rc/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
diff --git a/docker_27.2.1-cli-alpine3.20/Dockerfile b/docker_27.2.1-cli-alpine3.20/Dockerfile
index 91a617a..24d3cd2 100644
--- a/docker_27.2.1-cli-alpine3.20/Dockerfile
+++ b/docker_27.2.1-cli-alpine3.20/Dockerfile
@@ -103,38 +103,38 @@ RUN set -eux; \
\
docker buildx version
-ENV DOCKER_COMPOSE_VERSION 2.29.4
+ENV DOCKER_COMPOSE_VERSION 2.29.5
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-x86_64'; \
- sha256='2eb8de746c0bc724bb5da4de52fc9660c2e866afc9a639ffdb1adfef2649cc0c'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-x86_64'; \
+ sha256='589f98f1395936170815282d77dbcb9935210536c769778aedd09c4ff5eec33b'; \
;; \
'armhf') \
- url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv6'; \
- sha256='ad707af427c3d3574c9e7dbc77915dcd06779a58e2c3b3783f7781166213454e'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv6'; \
+ sha256='3484cca874ef8eac4a81a020acbf8380dd9fa6176a1162a2591a42dd26d3d182'; \
;; \
'armv7') \
- url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv7'; \
- sha256='bd473fb4fcdb6ff9d1616d7ff3294387a574298083de91a36eed2741341f3c97'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv7'; \
+ sha256='03848bfe15f37fb078d6ad6f63183de985c837791e472b4e15e5768ab29ca84b'; \
;; \
'aarch64') \
- url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-aarch64'; \
- sha256='d95d239bec166137a1ede1d441cb808da800dacc6041c966be35066aa96c6ee7'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-aarch64'; \
+ sha256='1301f1e1d94e9f03f39448c1bff5b14238770438f5c698e09ffaa7fad9969901'; \
;; \
'ppc64le') \
- url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-ppc64le'; \
- sha256='72d4359904b6821b04b77f7dac609b994847838d1d38e5840362d64dc35d9bff'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-ppc64le'; \
+ sha256='756103706b378948e989d8aa7e4694a9d8691aabd73019064b57ad4315f6388a'; \
;; \
'riscv64') \
- url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-riscv64'; \
- sha256='34f859fd5b5d3f081a88004ad9a165b01f5b549abb76e0b99a3281bc963ebbde'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-riscv64'; \
+ sha256='6dca0ca98fdcbfbbf26318bf74bb7faf8f221201370f059c83dc554fe08fce23'; \
;; \
's390x') \
- url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-s390x'; \
- sha256='d4f333a3abb6f4904e75e56196a3e6671797ef2f5e09cfbe71263f2dad466ea0'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-s390x'; \
+ sha256='6a43ae85495ceaa1b41f8958c1677ce0e25991f96b3bc47107f4af0e4db8927d'; \
;; \
*) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \
esac; \
diff --git a/docker_27.3.0-rc.1-cli-alpine3.20/Dockerfile b/docker_27.3.0-rc.1-cli-alpine3.20/Dockerfile
index 5f5fd7f..4d48abb 100644
--- a/docker_27.3.0-rc.1-cli-alpine3.20/Dockerfile
+++ b/docker_27.3.0-rc.1-cli-alpine3.20/Dockerfile
@@ -103,38 +103,38 @@ RUN set -eux; \
\
docker buildx version
-ENV DOCKER_COMPOSE_VERSION 2.29.4
+ENV DOCKER_COMPOSE_VERSION 2.29.5
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-x86_64'; \
- sha256='2eb8de746c0bc724bb5da4de52fc9660c2e866afc9a639ffdb1adfef2649cc0c'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-x86_64'; \
+ sha256='589f98f1395936170815282d77dbcb9935210536c769778aedd09c4ff5eec33b'; \
;; \
'armhf') \
- url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv6'; \
- sha256='ad707af427c3d3574c9e7dbc77915dcd06779a58e2c3b3783f7781166213454e'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv6'; \
+ sha256='3484cca874ef8eac4a81a020acbf8380dd9fa6176a1162a2591a42dd26d3d182'; \
;; \
'armv7') \
- url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-armv7'; \
- sha256='bd473fb4fcdb6ff9d1616d7ff3294387a574298083de91a36eed2741341f3c97'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-armv7'; \
+ sha256='03848bfe15f37fb078d6ad6f63183de985c837791e472b4e15e5768ab29ca84b'; \
;; \
'aarch64') \
- url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-aarch64'; \
- sha256='d95d239bec166137a1ede1d441cb808da800dacc6041c966be35066aa96c6ee7'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-aarch64'; \
+ sha256='1301f1e1d94e9f03f39448c1bff5b14238770438f5c698e09ffaa7fad9969901'; \
;; \
'ppc64le') \
- url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-ppc64le'; \
- sha256='72d4359904b6821b04b77f7dac609b994847838d1d38e5840362d64dc35d9bff'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-ppc64le'; \
+ sha256='756103706b378948e989d8aa7e4694a9d8691aabd73019064b57ad4315f6388a'; \
;; \
'riscv64') \
- url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-riscv64'; \
- sha256='34f859fd5b5d3f081a88004ad9a165b01f5b549abb76e0b99a3281bc963ebbde'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-riscv64'; \
+ sha256='6dca0ca98fdcbfbbf26318bf74bb7faf8f221201370f059c83dc554fe08fce23'; \
;; \
's390x') \
- url='https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-linux-s390x'; \
- sha256='d4f333a3abb6f4904e75e56196a3e6671797ef2f5e09cfbe71263f2dad466ea0'; \
+ url='https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-linux-s390x'; \
+ sha256='6a43ae85495ceaa1b41f8958c1677ce0e25991f96b3bc47107f4af0e4db8927d'; \
;; \
*) 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 bf1ba96..4f638d6 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.29.4
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 ae793808ae7cb326b2a20a35b1ff66022bf05d9a80bb08822f4455bbb44ff2c8
+ENV DOCKER_COMPOSE_VERSION 2.29.5
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 4eda107dc1f83a57116c57595d39e6a0ff63e696a52230ea277bd7fa7977c8d7
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 ef26712..ab04ef9 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.29.4
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 ae793808ae7cb326b2a20a35b1ff66022bf05d9a80bb08822f4455bbb44ff2c8
+ENV DOCKER_COMPOSE_VERSION 2.29.5
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 4eda107dc1f83a57116c57595d39e6a0ff63e696a52230ea277bd7fa7977c8d7
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 fa81b06..d9577e3 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.29.4
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 ae793808ae7cb326b2a20a35b1ff66022bf05d9a80bb08822f4455bbb44ff2c8
+ENV DOCKER_COMPOSE_VERSION 2.29.5
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 4eda107dc1f83a57116c57595d39e6a0ff63e696a52230ea277bd7fa7977c8d7
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 9fe8008..e816502 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.29.4
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.4/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 ae793808ae7cb326b2a20a35b1ff66022bf05d9a80bb08822f4455bbb44ff2c8
+ENV DOCKER_COMPOSE_VERSION 2.29.5
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.29.5/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 4eda107dc1f83a57116c57595d39e6a0ff63e696a52230ea277bd7fa7977c8d7
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
Sep 17, 2024
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: