Update docker #15183
Merged
Update docker #15183
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@f745ee7: Update 24 to compose 2.20.3 - docker-library/docker@e0434f3: Update 23 to compose 2.20.3
Diff for d71cb98:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 69e6f30..3c2ddba 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,7 +4,7 @@ Builder: buildkit
Tags: 23.0.6-cli, 23.0-cli, 23-cli, 23.0.6-cli-alpine3.18
Architectures: amd64, arm64v8
-GitCommit: cb48c20d320555c4486a1211b485ccf1f100a829
+GitCommit: e0434f3ab21e20772dfbcd513fe93e32b405560a
Directory: 23/cli
Tags: 23.0.6-dind, 23.0-dind, 23-dind, 23.0.6-dind-alpine3.18, 23.0.6, 23.0, 23, 23.0.6-alpine3.18
@@ -25,7 +25,7 @@ Directory: 23/git
Tags: 23.0.6-windowsservercore-1809, 23.0-windowsservercore-1809, 23-windowsservercore-1809
SharedTags: 23.0.6-windowsservercore, 23.0-windowsservercore, 23-windowsservercore
Architectures: windows-amd64
-GitCommit: cb48c20d320555c4486a1211b485ccf1f100a829
+GitCommit: e0434f3ab21e20772dfbcd513fe93e32b405560a
Directory: 23/windows/windowsservercore-1809
Builder: classic
Constraints: windowsservercore-1809
@@ -33,14 +33,14 @@ Constraints: windowsservercore-1809
Tags: 23.0.6-windowsservercore-ltsc2022, 23.0-windowsservercore-ltsc2022, 23-windowsservercore-ltsc2022
SharedTags: 23.0.6-windowsservercore, 23.0-windowsservercore, 23-windowsservercore
Architectures: windows-amd64
-GitCommit: cb48c20d320555c4486a1211b485ccf1f100a829
+GitCommit: e0434f3ab21e20772dfbcd513fe93e32b405560a
Directory: 23/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
Tags: 24.0.5-cli, 24.0-cli, 24-cli, cli, 24.0.5-cli-alpine3.18
Architectures: amd64, arm64v8
-GitCommit: f6bb49f0c0e7ed0ab489df14b53e26cc65c294d6
+GitCommit: f745ee7e7dc85e8ddbcc23fd17cffe5735b93f23
Directory: 24/cli
Tags: 24.0.5-dind, 24.0-dind, 24-dind, dind, 24.0.5-dind-alpine3.18, 24.0.5, 24.0, 24, latest, 24.0.5-alpine3.18
@@ -61,7 +61,7 @@ Directory: 24/git
Tags: 24.0.5-windowsservercore-1809, 24.0-windowsservercore-1809, 24-windowsservercore-1809, windowsservercore-1809
SharedTags: 24.0.5-windowsservercore, 24.0-windowsservercore, 24-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: f6bb49f0c0e7ed0ab489df14b53e26cc65c294d6
+GitCommit: f745ee7e7dc85e8ddbcc23fd17cffe5735b93f23
Directory: 24/windows/windowsservercore-1809
Builder: classic
Constraints: windowsservercore-1809
@@ -69,7 +69,7 @@ Constraints: windowsservercore-1809
Tags: 24.0.5-windowsservercore-ltsc2022, 24.0-windowsservercore-ltsc2022, 24-windowsservercore-ltsc2022, windowsservercore-ltsc2022
SharedTags: 24.0.5-windowsservercore, 24.0-windowsservercore, 24-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: f6bb49f0c0e7ed0ab489df14b53e26cc65c294d6
+GitCommit: f745ee7e7dc85e8ddbcc23fd17cffe5735b93f23
Directory: 24/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
diff --git a/docker_23-windowsservercore-1809/Dockerfile b/docker_23-windowsservercore-1809/Dockerfile
index 4f45a95..b56a6f1 100644
--- a/docker_23-windowsservercore-1809/Dockerfile
+++ b/docker_23-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.20.2
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 d381f0697ce5d469917ab343dd4e59ae404865af8a5cf43178005bf400f0113a
+ENV DOCKER_COMPOSE_VERSION 2.20.3
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 78277205b4c58c6b432c0cc428766e3f2c094eb2e4d52121fd8a62eeea483199
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_23-windowsservercore-ltsc2022/Dockerfile b/docker_23-windowsservercore-ltsc2022/Dockerfile
index 069804c..a4a2d78 100644
--- a/docker_23-windowsservercore-ltsc2022/Dockerfile
+++ b/docker_23-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.20.2
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 d381f0697ce5d469917ab343dd4e59ae404865af8a5cf43178005bf400f0113a
+ENV DOCKER_COMPOSE_VERSION 2.20.3
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 78277205b4c58c6b432c0cc428766e3f2c094eb2e4d52121fd8a62eeea483199
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_23.0.6-cli-alpine3.18/Dockerfile b/docker_23.0.6-cli-alpine3.18/Dockerfile
index 60b83ee..f9ec2fd 100644
--- a/docker_23.0.6-cli-alpine3.18/Dockerfile
+++ b/docker_23.0.6-cli-alpine3.18/Dockerfile
@@ -97,38 +97,38 @@ RUN set -eux; \
\
docker buildx version
-ENV DOCKER_COMPOSE_VERSION 2.20.2
+ENV DOCKER_COMPOSE_VERSION 2.20.3
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-x86_64'; \
- sha256='b9385dabb7931636a3afc0aee94625ebff3bb29584493a87804afb6ebaf2d916'; \
+ url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-x86_64'; \
+ sha256='f45e4cb687df8b48a57f656097ce7175fa8e8bef70be407b011e29ff663f475f'; \
;; \
'armhf') \
- url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv6'; \
- sha256='39cef332454d1c7a26e12f8d9ee297908d1da9cb71112ede1816c550766ddb8e'; \
+ url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv6'; \
+ sha256='e2010f160f5077c6d4d777965d21147328dbfb29894e60a5fbbce716284fd3cf'; \
;; \
'armv7') \
- url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv7'; \
- sha256='139275f3453761b46f0837a4e4c2a00883b778abee997e299c52e1bcf3d8fc9f'; \
+ url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv7'; \
+ sha256='f62e5fb2e1908152c5f3e250faa2057c3d3351207eedd4c042ff540bba5f7575'; \
;; \
'aarch64') \
- url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-aarch64'; \
- sha256='e63a24e57d2104a09b37ee6aa04c76f4ae85bdf7a59e1bf79adc6d5f55340a31'; \
+ url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-aarch64'; \
+ sha256='9d6a6396b7604a390977ffff78379090f7c6910160bbd3b9669e2fcc635633c5'; \
;; \
'ppc64le') \
- url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-ppc64le'; \
- sha256='9c08eb875a7ffd4a832a585540a4c9c81da5dcab263ec3e704ab1d62b573636f'; \
+ url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-ppc64le'; \
+ sha256='463d3d220da0fe49c40605a1fc9e4ed7414f47c0ac028c80c55d2e758e99d7ee'; \
;; \
'riscv64') \
- url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-riscv64'; \
- sha256='5a3bff32ecf0a5a38a83afeb3dc2effd8ca3d52eb2e07ec000334663d493055b'; \
+ url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-riscv64'; \
+ sha256='03b0ec338482f61593074b62ffab482ae67ecdc5d868eb72bb8fe3f8a7680c91'; \
;; \
's390x') \
- url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-s390x'; \
- sha256='297be6a0ece070ae95d5caf91a23b89dc1b2563e928db80eee480d7018919ee6'; \
+ url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-s390x'; \
+ sha256='3b24ddd85e859757801a8b9a7e53b96882fa5fd18cc12ee8750770f43b6afa14'; \
;; \
*) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \
esac; \
diff --git a/docker_24.0.5-cli-alpine3.18/Dockerfile b/docker_24.0.5-cli-alpine3.18/Dockerfile
index c6163c7..89fdc82 100644
--- a/docker_24.0.5-cli-alpine3.18/Dockerfile
+++ b/docker_24.0.5-cli-alpine3.18/Dockerfile
@@ -97,38 +97,38 @@ RUN set -eux; \
\
docker buildx version
-ENV DOCKER_COMPOSE_VERSION 2.20.2
+ENV DOCKER_COMPOSE_VERSION 2.20.3
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-x86_64'; \
- sha256='b9385dabb7931636a3afc0aee94625ebff3bb29584493a87804afb6ebaf2d916'; \
+ url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-x86_64'; \
+ sha256='f45e4cb687df8b48a57f656097ce7175fa8e8bef70be407b011e29ff663f475f'; \
;; \
'armhf') \
- url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv6'; \
- sha256='39cef332454d1c7a26e12f8d9ee297908d1da9cb71112ede1816c550766ddb8e'; \
+ url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv6'; \
+ sha256='e2010f160f5077c6d4d777965d21147328dbfb29894e60a5fbbce716284fd3cf'; \
;; \
'armv7') \
- url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-armv7'; \
- sha256='139275f3453761b46f0837a4e4c2a00883b778abee997e299c52e1bcf3d8fc9f'; \
+ url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-armv7'; \
+ sha256='f62e5fb2e1908152c5f3e250faa2057c3d3351207eedd4c042ff540bba5f7575'; \
;; \
'aarch64') \
- url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-aarch64'; \
- sha256='e63a24e57d2104a09b37ee6aa04c76f4ae85bdf7a59e1bf79adc6d5f55340a31'; \
+ url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-aarch64'; \
+ sha256='9d6a6396b7604a390977ffff78379090f7c6910160bbd3b9669e2fcc635633c5'; \
;; \
'ppc64le') \
- url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-ppc64le'; \
- sha256='9c08eb875a7ffd4a832a585540a4c9c81da5dcab263ec3e704ab1d62b573636f'; \
+ url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-ppc64le'; \
+ sha256='463d3d220da0fe49c40605a1fc9e4ed7414f47c0ac028c80c55d2e758e99d7ee'; \
;; \
'riscv64') \
- url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-riscv64'; \
- sha256='5a3bff32ecf0a5a38a83afeb3dc2effd8ca3d52eb2e07ec000334663d493055b'; \
+ url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-riscv64'; \
+ sha256='03b0ec338482f61593074b62ffab482ae67ecdc5d868eb72bb8fe3f8a7680c91'; \
;; \
's390x') \
- url='https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-linux-s390x'; \
- sha256='297be6a0ece070ae95d5caf91a23b89dc1b2563e928db80eee480d7018919ee6'; \
+ url='https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-s390x'; \
+ sha256='3b24ddd85e859757801a8b9a7e53b96882fa5fd18cc12ee8750770f43b6afa14'; \
;; \
*) 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 5a542b4..b07bc0f 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.20.2
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 d381f0697ce5d469917ab343dd4e59ae404865af8a5cf43178005bf400f0113a
+ENV DOCKER_COMPOSE_VERSION 2.20.3
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 78277205b4c58c6b432c0cc428766e3f2c094eb2e4d52121fd8a62eeea483199
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 92eaa9e..d194ee9 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.20.2
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.2/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 d381f0697ce5d469917ab343dd4e59ae404865af8a5cf43178005bf400f0113a
+ENV DOCKER_COMPOSE_VERSION 2.20.3
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 78277205b4c58c6b432c0cc428766e3f2c094eb2e4d52121fd8a62eeea483199
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: