Update docker #15576
Merged
Update docker #15576
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@a248877: Update 24 to compose 2.23.0
Diff for 03a6973:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 5443879..d9d2c03 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,7 +4,7 @@ Builder: buildkit
Tags: 24.0.6-cli, 24.0-cli, 24-cli, cli, 24.0.6-cli-alpine3.18
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: ff78b7b5f1f0830aa327380eb396dea53380b517
+GitCommit: a248877a927ea421717db21fd168482b027913d2
Directory: 24/cli
Tags: 24.0.6-dind, 24.0-dind, 24-dind, dind, 24.0.6-dind-alpine3.18, 24.0.6, 24.0, 24, latest, 24.0.6-alpine3.18
@@ -25,7 +25,7 @@ Directory: 24/git
Tags: 24.0.6-windowsservercore-1809, 24.0-windowsservercore-1809, 24-windowsservercore-1809, windowsservercore-1809
SharedTags: 24.0.6-windowsservercore, 24.0-windowsservercore, 24-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 112eb0209e4ce46e18059a9bd1b3b63f9409d360
+GitCommit: a248877a927ea421717db21fd168482b027913d2
Directory: 24/windows/windowsservercore-1809
Builder: classic
Constraints: windowsservercore-1809
@@ -33,7 +33,7 @@ Constraints: windowsservercore-1809
Tags: 24.0.6-windowsservercore-ltsc2022, 24.0-windowsservercore-ltsc2022, 24-windowsservercore-ltsc2022, windowsservercore-ltsc2022
SharedTags: 24.0.6-windowsservercore, 24.0-windowsservercore, 24-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 112eb0209e4ce46e18059a9bd1b3b63f9409d360
+GitCommit: a248877a927ea421717db21fd168482b027913d2
Directory: 24/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
diff --git a/docker_24.0.6-cli-alpine3.18/Dockerfile b/docker_24.0.6-cli-alpine3.18/Dockerfile
index f02af6d..d6b8c5f 100644
--- a/docker_24.0.6-cli-alpine3.18/Dockerfile
+++ b/docker_24.0.6-cli-alpine3.18/Dockerfile
@@ -97,38 +97,38 @@ RUN set -eux; \
\
docker buildx version
-ENV DOCKER_COMPOSE_VERSION 2.22.0
+ENV DOCKER_COMPOSE_VERSION 2.23.0
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-x86_64'; \
- sha256='e849450f1c5c20123aa7d63291e2a818b7a117f2e03e432853ece463dd09e67a'; \
+ url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-x86_64'; \
+ sha256='6e06123399e5428fbd603564afdac74821fa0a7b4465e8a1a2359b362fc42fc4'; \
;; \
'armhf') \
- url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv6'; \
- sha256='46cabb4363c5fa66e63c6055b1d0a6fe2c7995350e48f14816a752ae4132231d'; \
+ url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv6'; \
+ sha256='75889ad81c5b0b07805920e398eaa7fb41c1321c81942daa07a5b5c5a1a27bdb'; \
;; \
'armv7') \
- url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-armv7'; \
- sha256='1a0d500eaae3c4ddbfdeb566896207c0628a671065b95d0e8907bca58f91d312'; \
+ url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-armv7'; \
+ sha256='2cd4af627462720384cfd2ba24d951854707d7c1fa37618c9e0319139f8a2012'; \
;; \
'aarch64') \
- url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-aarch64'; \
- sha256='572a22000d408fb524258b379bf272a007c8da977c3e8d47c34f4e45dd7b1932'; \
+ url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-aarch64'; \
+ sha256='5c09e2c6b1cd9fc1be535690ee62712687ad12f0d08b14c27d30442f0e85b955'; \
;; \
'ppc64le') \
- url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-ppc64le'; \
- sha256='4d1a3e89fdb7641422dc5cbcab48fd2da337b03265cb5ac2858c3425bacf952c'; \
+ url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-ppc64le'; \
+ sha256='ff524f6d11050483abda01c5b1b33626c6c2f1b835df8514db6a42148d5095fc'; \
;; \
'riscv64') \
- url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-riscv64'; \
- sha256='c45193b98c54e5a898e6b9095f70b0487599f19ce25b579ed2fcc3f868415aff'; \
+ url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-riscv64'; \
+ sha256='00302be14ad7d981eb86b834c09deb8186231b416c16454f9971bfcc0ec7e22f'; \
;; \
's390x') \
- url='https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-linux-s390x'; \
- sha256='716aded74df512728638f1fe53170c46d94c1a085bc5a24108ce7101bc37bd81'; \
+ url='https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-linux-s390x'; \
+ sha256='323c2e92b3150ef94dc4201770e06ed7bacbe811abd77a23108cceea032fcf63'; \
;; \
*) 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 e93ad26..adabdee 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.22.0
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 eeddd5d558d2711bd61a41f5761610b085d83e896617ff04aec8561b349a826c
+ENV DOCKER_COMPOSE_VERSION 2.23.0
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 254a2770f208d11cd131b89758c9810650521cce2e831e7478d6418e8baea3da
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 be3ba17..65aef44 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.22.0
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.22.0/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 eeddd5d558d2711bd61a41f5761610b085d83e896617ff04aec8561b349a826c
+ENV DOCKER_COMPOSE_VERSION 2.23.0
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.23.0/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 254a2770f208d11cd131b89758c9810650521cce2e831e7478d6418e8baea3da
RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
Write-Host ('Creating {0} ...' -f $dir); \
New-Item -ItemType Directory $dir -Force; \Relevant Maintainers: |
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: