Skip to content
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 #13781

Merged
merged 1 commit into from
Dec 22, 2022
Merged

Update docker #13781

merged 1 commit into from
Dec 22, 2022

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 22, 2022

Changes:

Changes:

- docker-library/docker@7dc92d7: Update 23.0-rc to compose 2.14.2
- docker-library/docker@a7c1c99: Update 20.10 to compose 2.14.2
@github-actions
Copy link

Diff for af7bef9:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index f6d4ff2..59dd325 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,7 +3,7 @@ GitRepo: https://github.com/docker-library/docker.git
 
 Tags: 20.10.22-cli, 20.10-cli, 20-cli, cli, 20.10.22-cli-alpine3.17, 20.10.22, 20.10, 20, latest, 20.10.22-alpine3.17
 Architectures: amd64, arm64v8
-GitCommit: 32a92d275e8aa2edd2a99ad55e56a106e48601d6
+GitCommit: a7c1c992dcb9ee46f028aec8558188738b5c005c
 Directory: 20.10/cli
 
 Tags: 20.10.22-dind, 20.10-dind, 20-dind, dind, 20.10.22-dind-alpine3.17
@@ -37,7 +37,7 @@ Constraints: windowsservercore-ltsc2022
 
 Tags: 23.0.0-beta.1-cli, 23.0-rc-cli, rc-cli, 23.0.0-beta.1-cli-alpine3.17
 Architectures: amd64, arm64v8
-GitCommit: c70759e9e3b33e11688e161af5547479b40080a2
+GitCommit: 7dc92d7c5555cedf97411b179c617ef2781a06bd
 Directory: 23.0-rc/cli
 
 Tags: 23.0.0-beta.1-dind, 23.0-rc-dind, rc-dind, 23.0.0-beta.1-dind-alpine3.17, 23.0.0-beta.1, 23.0-rc, rc, 23.0.0-beta.1-alpine3.17
diff --git a/docker_20.10.22-alpine3.17/Dockerfile b/docker_20.10.22-alpine3.17/Dockerfile
index 8e26f27..1fb0389 100644
--- a/docker_20.10.22-alpine3.17/Dockerfile
+++ b/docker_20.10.22-alpine3.17/Dockerfile
@@ -99,38 +99,38 @@ RUN set -eux; \
 	\
 	docker buildx version
 
-ENV DOCKER_COMPOSE_VERSION 2.14.1
+ENV DOCKER_COMPOSE_VERSION 2.14.2
 RUN set -eux; \
 	\
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-x86_64'; \
-			sha256='e0c916bd108c49830c7847e416787387398f97de8dda7c1c35dad59438692664'; \
+			url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-x86_64'; \
+			sha256='d056a8330a01f22c249b9fa03ad0d5be889b79b648cad43c8549eb4c3f8ff0ba'; \
 			;; \
 		'armhf') \
-			url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv6'; \
-			sha256='7345474ef0ce498a9e7befb14679d8ba86b8a03e81072cd9cfa4e0345b2eb1d6'; \
+			url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv6'; \
+			sha256='164b04d5970f340eb6cb4da171b2dc0d12c345a6092c8ac2409b5fb4fc8af5e6'; \
 			;; \
 		'armv7') \
-			url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv7'; \
-			sha256='4f283a2341f8faa9dd58fd68ffa45bc4909051ab8d8f376998155ec0a3d4123e'; \
+			url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv7'; \
+			sha256='6e01028d97bc48bfd3894d9161586e74c0f37cf7d67a67ab7eafb351c2003cb3'; \
 			;; \
 		'aarch64') \
-			url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-aarch64'; \
-			sha256='49924009641e9a60f178b4085c9d308bb726b5ae74eed46c5d1a7dbc8f04948b'; \
+			url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-aarch64'; \
+			sha256='48ef22ecea70b4b197def1c1bfd2e797f7117db5257f6e505e64f03fdc329a7e'; \
 			;; \
 		'ppc64le') \
-			url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-ppc64le'; \
-			sha256='6699d98c002532f719954ecf8737dfed39d0fd079c71438f04fe0ee63d23f0f1'; \
+			url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-ppc64le'; \
+			sha256='8cbceb45fc656ec9f9e24b8e61fda54d233ecc8f46cee8ef5ae5acfdcc7940d4'; \
 			;; \
 		'riscv64') \
-			url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-riscv64'; \
-			sha256='c5a51c7db8b8008d4645241d917afbbb752829753c83858e030154e8c541d827'; \
+			url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-riscv64'; \
+			sha256='e9d612ff8d198911f93706f4eec2bb58abb24c0f869cff7d69f6a8e24ce05420'; \
 			;; \
 		's390x') \
-			url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-s390x'; \
-			sha256='44b132059a2162834e7f7c285362f5a007f2569943496cc1656cce8aaea0dd2b'; \
+			url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-s390x'; \
+			sha256='9fec4a8628729766f4600ec0f8fb5aa760b6a20673e1abfb3d78f3b2eb02696a'; \
 			;; \
 		*) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \
 	esac; \
diff --git a/docker_23.0.0-beta.1-cli-alpine3.17/Dockerfile b/docker_23.0.0-beta.1-cli-alpine3.17/Dockerfile
index ce7f616..589f8e4 100644
--- a/docker_23.0.0-beta.1-cli-alpine3.17/Dockerfile
+++ b/docker_23.0.0-beta.1-cli-alpine3.17/Dockerfile
@@ -99,38 +99,38 @@ RUN set -eux; \
 	\
 	docker buildx version
 
-ENV DOCKER_COMPOSE_VERSION 2.14.1
+ENV DOCKER_COMPOSE_VERSION 2.14.2
 RUN set -eux; \
 	\
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-x86_64'; \
-			sha256='e0c916bd108c49830c7847e416787387398f97de8dda7c1c35dad59438692664'; \
+			url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-x86_64'; \
+			sha256='d056a8330a01f22c249b9fa03ad0d5be889b79b648cad43c8549eb4c3f8ff0ba'; \
 			;; \
 		'armhf') \
-			url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv6'; \
-			sha256='7345474ef0ce498a9e7befb14679d8ba86b8a03e81072cd9cfa4e0345b2eb1d6'; \
+			url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv6'; \
+			sha256='164b04d5970f340eb6cb4da171b2dc0d12c345a6092c8ac2409b5fb4fc8af5e6'; \
 			;; \
 		'armv7') \
-			url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv7'; \
-			sha256='4f283a2341f8faa9dd58fd68ffa45bc4909051ab8d8f376998155ec0a3d4123e'; \
+			url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-armv7'; \
+			sha256='6e01028d97bc48bfd3894d9161586e74c0f37cf7d67a67ab7eafb351c2003cb3'; \
 			;; \
 		'aarch64') \
-			url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-aarch64'; \
-			sha256='49924009641e9a60f178b4085c9d308bb726b5ae74eed46c5d1a7dbc8f04948b'; \
+			url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-aarch64'; \
+			sha256='48ef22ecea70b4b197def1c1bfd2e797f7117db5257f6e505e64f03fdc329a7e'; \
 			;; \
 		'ppc64le') \
-			url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-ppc64le'; \
-			sha256='6699d98c002532f719954ecf8737dfed39d0fd079c71438f04fe0ee63d23f0f1'; \
+			url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-ppc64le'; \
+			sha256='8cbceb45fc656ec9f9e24b8e61fda54d233ecc8f46cee8ef5ae5acfdcc7940d4'; \
 			;; \
 		'riscv64') \
-			url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-riscv64'; \
-			sha256='c5a51c7db8b8008d4645241d917afbbb752829753c83858e030154e8c541d827'; \
+			url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-riscv64'; \
+			sha256='e9d612ff8d198911f93706f4eec2bb58abb24c0f869cff7d69f6a8e24ce05420'; \
 			;; \
 		's390x') \
-			url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-s390x'; \
-			sha256='44b132059a2162834e7f7c285362f5a007f2569943496cc1656cce8aaea0dd2b'; \
+			url='https://github.com/docker/compose/releases/download/v2.14.2/docker-compose-linux-s390x'; \
+			sha256='9fec4a8628729766f4600ec0f8fb5aa760b6a20673e1abfb3d78f3b2eb02696a'; \
 			;; \
 		*) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \
 	esac; \

Relevant Maintainers:

@yosifkit yosifkit merged commit 32b0e7d into docker-library:master Dec 22, 2022
@yosifkit yosifkit deleted the docker branch December 22, 2022 00:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants