-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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 #17845
Merged
Merged
Update docker #17845
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@bef0144: Update 27 to compose 2.30.2
Diff for c8ef39c:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 2c5b8cd..e8a2616 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,7 +4,7 @@ Builder: buildkit
Tags: 27.3.1-cli, 27.3-cli, 27-cli, cli, 27.3.1-cli-alpine3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: e4f50f81c8421f07f3e4b546c8b5313bd0042ef5
+GitCommit: bef014490d74e648d3b6a0ff61919022c150a12b
Directory: 27/cli
Tags: 27.3.1-dind, 27.3-dind, 27-dind, dind, 27.3.1-dind-alpine3.20, 27.3.1, 27.3, 27, latest, 27.3.1-alpine3.20
@@ -20,7 +20,7 @@ Directory: 27/dind-rootless
Tags: 27.3.1-windowsservercore-1809, 27.3-windowsservercore-1809, 27-windowsservercore-1809, windowsservercore-1809
SharedTags: 27.3.1-windowsservercore, 27.3-windowsservercore, 27-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: e4f50f81c8421f07f3e4b546c8b5313bd0042ef5
+GitCommit: bef014490d74e648d3b6a0ff61919022c150a12b
Directory: 27/windows/windowsservercore-1809
Builder: classic
Constraints: windowsservercore-1809
@@ -28,7 +28,7 @@ Constraints: windowsservercore-1809
Tags: 27.3.1-windowsservercore-ltsc2022, 27.3-windowsservercore-ltsc2022, 27-windowsservercore-ltsc2022, windowsservercore-ltsc2022
SharedTags: 27.3.1-windowsservercore, 27.3-windowsservercore, 27-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: e4f50f81c8421f07f3e4b546c8b5313bd0042ef5
+GitCommit: bef014490d74e648d3b6a0ff61919022c150a12b
Directory: 27/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
diff --git a/docker_27.3.1-cli-alpine3.20/Dockerfile b/docker_27.3.1-cli-alpine3.20/Dockerfile
index 03addd4..91e3998 100644
--- a/docker_27.3.1-cli-alpine3.20/Dockerfile
+++ b/docker_27.3.1-cli-alpine3.20/Dockerfile
@@ -103,38 +103,38 @@ RUN set -eux; \
\
docker buildx version
-ENV DOCKER_COMPOSE_VERSION 2.30.1
+ENV DOCKER_COMPOSE_VERSION 2.30.2
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-x86_64'; \
- sha256='bd976a501e471c14b320876686f1628db3c37ab223405d2a815022fc711e704e'; \
+ url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-x86_64'; \
+ sha256='64b798329464b7553bdf4706c5fb1a97dc9504b360f29d30479ac126017d3944'; \
;; \
'armhf') \
- url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-armv6'; \
- sha256='2c70bd6e01ceb550d81a1bb0981f8f24c58ec301ac0c1432db132e07842544fe'; \
+ url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-armv6'; \
+ sha256='a22f58dfc94fd1f8e86dee81e1378ae648c14a3bf0604d3a5434b53650619140'; \
;; \
'armv7') \
- url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-armv7'; \
- sha256='205f947e00fdfb2d4787fb5d38267d56e68bbf07757d8e30d7b1c9c1086c8477'; \
+ url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-armv7'; \
+ sha256='9fb8f299c55451c08ea04dd7770fd698f45e31ab12df99dd582f0fa0984f5364'; \
;; \
'aarch64') \
- url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-aarch64'; \
- sha256='f869d0900f8744b3f295c5bf8ed68488110598891d3db1d93db7203db9fa535b'; \
+ url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-aarch64'; \
+ sha256='2c7c902a845288c5733f6d13910ef65e17283f25b3519dee704d6d74de2ec78b'; \
;; \
'ppc64le') \
- url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-ppc64le'; \
- sha256='93e47b53fcaaa366555cfa92ff49c77c16e2d76ccf26f816db24683b6bdb36ac'; \
+ url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-ppc64le'; \
+ sha256='a3778d98118d408620eeed110a9bf85c77460601384899566293e8e90e21e206'; \
;; \
'riscv64') \
- url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-riscv64'; \
- sha256='0431d523628c26e74308be72205d13866bc978970b2e98efc60f5ecf23089ed2'; \
+ url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-riscv64'; \
+ sha256='9d3215288f9e9626c4e720576582fedbb4dfa3c728e53e3bb7151eca0251fa5c'; \
;; \
's390x') \
- url='https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-linux-s390x'; \
- sha256='afed38f2f18219d3fe79f2f0bc11d21458195c7f19d812c3ecd1a2608094fa84'; \
+ url='https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-linux-s390x'; \
+ sha256='797f3d346f53ffc751eb0bebc9c8f610503bdea84ec993d00ee15e77ed2f0eb9'; \
;; \
*) 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 34ad5e3..77037eb 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.30.1
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 bf29dcf1b35cf226ca0fe337d0de903060ec50855eea5c0eb54739e3c3c3fa5a
+ENV DOCKER_COMPOSE_VERSION 2.30.2
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 c9d3cfb7b2781fae4d2f5bc3cab2cf38ce6e2b48e4d98305c60535f9e3c879d3
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 f98b641..cf7a22d 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.30.1
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.1/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 bf29dcf1b35cf226ca0fe337d0de903060ec50855eea5c0eb54739e3c3c3fa5a
+ENV DOCKER_COMPOSE_VERSION 2.30.2
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v2.30.2/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 c9d3cfb7b2781fae4d2f5bc3cab2cf38ce6e2b48e4d98305c60535f9e3c879d3
RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
Write-Host ('Creating {0} ...' -f $dir); \
New-Item -ItemType Directory $dir -Force; \ Relevant Maintainers: |
yosifkit
approved these changes
Nov 5, 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: