-
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 #13238
Merged
Merged
Update docker #13238
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@9d962f8: Update 22.06-rc to compose 2.11.2 - docker-library/docker@2fc53e8: Update 20.10 to compose 2.11.2
Diff for fff097e:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 15ff33b..6d30e39 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,7 +3,7 @@ GitRepo: https://github.com/docker-library/docker.git
Tags: 20.10.18-cli, 20.10-cli, 20-cli, cli, 20.10.18-cli-alpine3.16, 20.10.18, 20.10, 20, latest, 20.10.18-alpine3.16
Architectures: amd64, arm64v8
-GitCommit: 5e3e40486df3af0f9675c115a6127e10ac4f5b95
+GitCommit: 2fc53e853187b5f5ba0c4696189ce7abc6b62a1d
Directory: 20.10/cli
Tags: 20.10.18-dind, 20.10-dind, 20-dind, dind, 20.10.18-dind-alpine3.16
@@ -37,7 +37,7 @@ Constraints: windowsservercore-ltsc2022
Tags: 22.06.0-beta.0-cli, 22.06-rc-cli, rc-cli, 22.06.0-beta.0-cli-alpine3.16
Architectures: amd64, arm64v8
-GitCommit: 0eb3eda3afc958405489aeda90531e558eb9e475
+GitCommit: 9d962f884ebf8e098b772f47938bc8486c6b6f7b
Directory: 22.06-rc/cli
Tags: 22.06.0-beta.0-dind, 22.06-rc-dind, rc-dind, 22.06.0-beta.0-dind-alpine3.16, 22.06.0-beta.0, 22.06-rc, rc, 22.06.0-beta.0-alpine3.16
diff --git a/docker_20.10.18-alpine3.16/Dockerfile b/docker_20.10.18-alpine3.16/Dockerfile
index 2833ba6..27a185f 100644
--- a/docker_20.10.18-alpine3.16/Dockerfile
+++ b/docker_20.10.18-alpine3.16/Dockerfile
@@ -99,38 +99,38 @@ RUN set -eux; \
\
docker buildx version
-ENV DOCKER_COMPOSE_VERSION 2.11.1
+ENV DOCKER_COMPOSE_VERSION 2.11.2
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-x86_64'; \
- sha256='f44b91e9ce260c2080dd2929dc2da06068be7a84b730d31522ecd3c3178b1753'; \
+ url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-x86_64'; \
+ sha256='1178848502b0771b96895febeb4b1736acd5019c4ed71a8efbabf6915185fe8a'; \
;; \
'armhf') \
- url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv6'; \
- sha256='4d96bf75953f203f5f1fc5aadd091279c89a38c46e840391b46cbe85cac6dbbd'; \
+ url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv6'; \
+ sha256='3e863e83a2701b26e168118f30456c3bd2ec37886182fc3373a8fe460e714761'; \
;; \
'armv7') \
- url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv7'; \
- sha256='89776e1133ebca5c5e974b1fc42ac36799d4c7ab6a2d1a59f3a5ce30b017ce63'; \
+ url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv7'; \
+ sha256='c133c194f36b3a6dcd552c4e32652f6ef7c22af258a6f14b414bf751aad3d2fd'; \
;; \
'aarch64') \
- url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-aarch64'; \
- sha256='ee53340ff5fc9077ebfbf8302806d2e3ce717f762afcdbe601656e1fe9128bbe'; \
+ url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-aarch64'; \
+ sha256='eb65ae4a4dd4de7dc767935c2bc49e3641d265df1273ea8f577cadb6bd9b4ebf'; \
;; \
'ppc64le') \
- url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-ppc64le'; \
- sha256='63a3ca91cd6b8c45f68cec490c34b6233ae887e0d1e35408bb173bd24e5877cc'; \
+ url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-ppc64le'; \
+ sha256='24f65d215a198e33f3f1646ebabd6cae00eb6d2d3442b86c97d8198331350785'; \
;; \
'riscv64') \
- url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-riscv64'; \
- sha256='2d6fcf2192fa0d3ae05b0501e1d3ff2420773885f61f612ab67fd07f6fa5bd3b'; \
+ url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-riscv64'; \
+ sha256='14a3de648bfa75a33ee8ded1cc8d501cff10c9d1565aab3dd641cf7283e9b51a'; \
;; \
's390x') \
- url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-s390x'; \
- sha256='8e58e3f865ee9bef094d47ac5c11da7faeaf85a203cbdbc180196d18197f97f7'; \
+ url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-s390x'; \
+ sha256='08e8612dc7aa2d983c6c07c54e483cbc1ec089cfe9d7f790643dd8dbd30ee4f5'; \
;; \
*) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \
esac; \
diff --git a/docker_22.06.0-beta.0-cli-alpine3.16/Dockerfile b/docker_22.06.0-beta.0-cli-alpine3.16/Dockerfile
index 7e9f2e2..7be6626 100644
--- a/docker_22.06.0-beta.0-cli-alpine3.16/Dockerfile
+++ b/docker_22.06.0-beta.0-cli-alpine3.16/Dockerfile
@@ -99,38 +99,38 @@ RUN set -eux; \
\
docker buildx version
-ENV DOCKER_COMPOSE_VERSION 2.11.1
+ENV DOCKER_COMPOSE_VERSION 2.11.2
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-x86_64'; \
- sha256='f44b91e9ce260c2080dd2929dc2da06068be7a84b730d31522ecd3c3178b1753'; \
+ url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-x86_64'; \
+ sha256='1178848502b0771b96895febeb4b1736acd5019c4ed71a8efbabf6915185fe8a'; \
;; \
'armhf') \
- url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv6'; \
- sha256='4d96bf75953f203f5f1fc5aadd091279c89a38c46e840391b46cbe85cac6dbbd'; \
+ url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv6'; \
+ sha256='3e863e83a2701b26e168118f30456c3bd2ec37886182fc3373a8fe460e714761'; \
;; \
'armv7') \
- url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-armv7'; \
- sha256='89776e1133ebca5c5e974b1fc42ac36799d4c7ab6a2d1a59f3a5ce30b017ce63'; \
+ url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-armv7'; \
+ sha256='c133c194f36b3a6dcd552c4e32652f6ef7c22af258a6f14b414bf751aad3d2fd'; \
;; \
'aarch64') \
- url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-aarch64'; \
- sha256='ee53340ff5fc9077ebfbf8302806d2e3ce717f762afcdbe601656e1fe9128bbe'; \
+ url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-aarch64'; \
+ sha256='eb65ae4a4dd4de7dc767935c2bc49e3641d265df1273ea8f577cadb6bd9b4ebf'; \
;; \
'ppc64le') \
- url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-ppc64le'; \
- sha256='63a3ca91cd6b8c45f68cec490c34b6233ae887e0d1e35408bb173bd24e5877cc'; \
+ url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-ppc64le'; \
+ sha256='24f65d215a198e33f3f1646ebabd6cae00eb6d2d3442b86c97d8198331350785'; \
;; \
'riscv64') \
- url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-riscv64'; \
- sha256='2d6fcf2192fa0d3ae05b0501e1d3ff2420773885f61f612ab67fd07f6fa5bd3b'; \
+ url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-riscv64'; \
+ sha256='14a3de648bfa75a33ee8ded1cc8d501cff10c9d1565aab3dd641cf7283e9b51a'; \
;; \
's390x') \
- url='https://github.com/docker/compose/releases/download/v2.11.1/docker-compose-linux-s390x'; \
- sha256='8e58e3f865ee9bef094d47ac5c11da7faeaf85a203cbdbc180196d18197f97f7'; \
+ url='https://github.com/docker/compose/releases/download/v2.11.2/docker-compose-linux-s390x'; \
+ sha256='08e8612dc7aa2d983c6c07c54e483cbc1ec089cfe9d7f790643dd8dbd30ee4f5'; \
;; \
*) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \
esac; \ 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: