Update docker #13760
Merged
Update docker #13760
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@32a92d2: Update 20.10 to 20.10.22 - docker-library/docker@c70759e: Update 23.0-rc to compose 2.14.1 - docker-library/docker@750eae1: Update 20.10 to compose 2.14.1
Diff for 9a7aad7:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 89681bf..f6d4ff2 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,43 +1,43 @@
Maintainers: Tianon Gravi <tianon@dockerproject.org> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/docker.git
-Tags: 20.10.21-cli, 20.10-cli, 20-cli, cli, 20.10.21-cli-alpine3.17, 20.10.21, 20.10, 20, latest, 20.10.21-alpine3.17
+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: d07d0bccbb31c1272ca7734a31d7ffa9e2a423aa
+GitCommit: 32a92d275e8aa2edd2a99ad55e56a106e48601d6
Directory: 20.10/cli
-Tags: 20.10.21-dind, 20.10-dind, 20-dind, dind, 20.10.21-dind-alpine3.17
+Tags: 20.10.22-dind, 20.10-dind, 20-dind, dind, 20.10.22-dind-alpine3.17
Architectures: amd64, arm64v8
-GitCommit: 75036d19c3d68de7d20277d707763f32ddd487aa
+GitCommit: 32a92d275e8aa2edd2a99ad55e56a106e48601d6
Directory: 20.10/dind
-Tags: 20.10.21-dind-rootless, 20.10-dind-rootless, 20-dind-rootless, dind-rootless
+Tags: 20.10.22-dind-rootless, 20.10-dind-rootless, 20-dind-rootless, dind-rootless
Architectures: amd64, arm64v8
-GitCommit: 1231bb8e025bdc715b8a8ca122ad20b5cf7ee469
+GitCommit: 32a92d275e8aa2edd2a99ad55e56a106e48601d6
Directory: 20.10/dind-rootless
-Tags: 20.10.21-git, 20.10-git, 20-git, git
+Tags: 20.10.22-git, 20.10-git, 20-git, git
Architectures: amd64, arm64v8
GitCommit: f23a2bea97f6d7ec563bc316302fb8edf620ec5b
Directory: 20.10/git
-Tags: 20.10.21-windowsservercore-1809, 20.10-windowsservercore-1809, 20-windowsservercore-1809, windowsservercore-1809
-SharedTags: 20.10.21-windowsservercore, 20.10-windowsservercore, 20-windowsservercore, windowsservercore
+Tags: 20.10.22-windowsservercore-1809, 20.10-windowsservercore-1809, 20-windowsservercore-1809, windowsservercore-1809
+SharedTags: 20.10.22-windowsservercore, 20.10-windowsservercore, 20-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 1231bb8e025bdc715b8a8ca122ad20b5cf7ee469
+GitCommit: 32a92d275e8aa2edd2a99ad55e56a106e48601d6
Directory: 20.10/windows/windowsservercore-1809
Constraints: windowsservercore-1809
-Tags: 20.10.21-windowsservercore-ltsc2022, 20.10-windowsservercore-ltsc2022, 20-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 20.10.21-windowsservercore, 20.10-windowsservercore, 20-windowsservercore, windowsservercore
+Tags: 20.10.22-windowsservercore-ltsc2022, 20.10-windowsservercore-ltsc2022, 20-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 20.10.22-windowsservercore, 20.10-windowsservercore, 20-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 1231bb8e025bdc715b8a8ca122ad20b5cf7ee469
+GitCommit: 32a92d275e8aa2edd2a99ad55e56a106e48601d6
Directory: 20.10/windows/windowsservercore-ltsc2022
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: c608944bf9422f7cd70951b9519866495b81e76d
+GitCommit: c70759e9e3b33e11688e161af5547479b40080a2
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/_bashbrew-list b/_bashbrew-list
index e91f49d..ef1520c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,17 +14,17 @@ docker:20.10-git
docker:20.10-windowsservercore
docker:20.10-windowsservercore-1809
docker:20.10-windowsservercore-ltsc2022
-docker:20.10.21
-docker:20.10.21-alpine3.17
-docker:20.10.21-cli
-docker:20.10.21-cli-alpine3.17
-docker:20.10.21-dind
-docker:20.10.21-dind-alpine3.17
-docker:20.10.21-dind-rootless
-docker:20.10.21-git
-docker:20.10.21-windowsservercore
-docker:20.10.21-windowsservercore-1809
-docker:20.10.21-windowsservercore-ltsc2022
+docker:20.10.22
+docker:20.10.22-alpine3.17
+docker:20.10.22-cli
+docker:20.10.22-cli-alpine3.17
+docker:20.10.22-dind
+docker:20.10.22-dind-alpine3.17
+docker:20.10.22-dind-rootless
+docker:20.10.22-git
+docker:20.10.22-windowsservercore
+docker:20.10.22-windowsservercore-1809
+docker:20.10.22-windowsservercore-ltsc2022
docker:23.0-rc
docker:23.0-rc-cli
docker:23.0-rc-dind
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 34e9270..835b69c 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,5 +1,5 @@
-docker:20.10.21-alpine3.17
-docker:20.10.21-dind-alpine3.17
+docker:20.10.22-alpine3.17
+docker:20.10.22-dind-alpine3.17
docker:dind-rootless
docker:git
docker:windowsservercore-1809
diff --git a/docker_20.10.21-alpine3.17/Dockerfile b/docker_20.10.22-alpine3.17/Dockerfile
similarity index 85%
rename from docker_20.10.21-alpine3.17/Dockerfile
rename to docker_20.10.22-alpine3.17/Dockerfile
index e6b85d2..8e26f27 100644
--- a/docker_20.10.21-alpine3.17/Dockerfile
+++ b/docker_20.10.22-alpine3.17/Dockerfile
@@ -19,23 +19,23 @@ RUN apk add --no-cache \
# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf
RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf
-ENV DOCKER_VERSION 20.10.21
+ENV DOCKER_VERSION 20.10.22
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.21.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.22.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-20.10.21.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-20.10.22.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.21.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.22.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.21.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.22.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
@@ -99,38 +99,38 @@ RUN set -eux; \
\
docker buildx version
-ENV DOCKER_COMPOSE_VERSION 2.14.0
+ENV DOCKER_COMPOSE_VERSION 2.14.1
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-x86_64'; \
- sha256='fdf634ab2b01aca33372bef2bf866699ef2e1f2dab19972e37967b1fc2a11402'; \
+ url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-x86_64'; \
+ sha256='e0c916bd108c49830c7847e416787387398f97de8dda7c1c35dad59438692664'; \
;; \
'armhf') \
- url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv6'; \
- sha256='63e0826ddebc1ae776f38ab872b41f68b48fca246cdf67c709e07eef543cdf88'; \
+ url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv6'; \
+ sha256='7345474ef0ce498a9e7befb14679d8ba86b8a03e81072cd9cfa4e0345b2eb1d6'; \
;; \
'armv7') \
- url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv7'; \
- sha256='c1664c4dcefc2a56a4f16f4dbd76e531f237bfbf713b90d3acea50df42a1aada'; \
+ url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv7'; \
+ sha256='4f283a2341f8faa9dd58fd68ffa45bc4909051ab8d8f376998155ec0a3d4123e'; \
;; \
'aarch64') \
- url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-aarch64'; \
- sha256='0265f45b30f4f0e1d53c1968c590181f64c546129d967460de382c6de38af191'; \
+ url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-aarch64'; \
+ sha256='49924009641e9a60f178b4085c9d308bb726b5ae74eed46c5d1a7dbc8f04948b'; \
;; \
'ppc64le') \
- url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-ppc64le'; \
- sha256='dbee58426af567787e5c1d14e925cca0d0a958edc55203c4b29c10dda8e27355'; \
+ url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-ppc64le'; \
+ sha256='6699d98c002532f719954ecf8737dfed39d0fd079c71438f04fe0ee63d23f0f1'; \
;; \
'riscv64') \
- url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-riscv64'; \
- sha256='d447a75ff4d900b19d40e0c69811b335518f8a5fbc6377e0aff25a3b999a8c49'; \
+ url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-riscv64'; \
+ sha256='c5a51c7db8b8008d4645241d917afbbb752829753c83858e030154e8c541d827'; \
;; \
's390x') \
- url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-s390x'; \
- sha256='2c5bbb6513d7377919bd4189f25d8bf5d8706a5345f10609d8c49d5cf4d8ab88'; \
+ url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-s390x'; \
+ sha256='44b132059a2162834e7f7c285362f5a007f2569943496cc1656cce8aaea0dd2b'; \
;; \
*) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \
esac; \
diff --git a/docker_20.10.21-alpine3.17/docker-entrypoint.sh b/docker_20.10.22-alpine3.17/docker-entrypoint.sh
similarity index 100%
rename from docker_20.10.21-alpine3.17/docker-entrypoint.sh
rename to docker_20.10.22-alpine3.17/docker-entrypoint.sh
diff --git a/docker_20.10.21-alpine3.17/modprobe.sh b/docker_20.10.22-alpine3.17/modprobe.sh
similarity index 100%
rename from docker_20.10.21-alpine3.17/modprobe.sh
rename to docker_20.10.22-alpine3.17/modprobe.sh
diff --git a/docker_20.10.21-dind-alpine3.17/Dockerfile b/docker_20.10.22-dind-alpine3.17/Dockerfile
similarity index 96%
rename from docker_20.10.21-dind-alpine3.17/Dockerfile
rename to docker_20.10.22-dind-alpine3.17/Dockerfile
index 592a4ac..e4d90cc 100644
--- a/docker_20.10.21-dind-alpine3.17/Dockerfile
+++ b/docker_20.10.22-dind-alpine3.17/Dockerfile
@@ -42,16 +42,16 @@ RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.21.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-20.10.22.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-20.10.21.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-20.10.22.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.21.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-20.10.22.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.21.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-20.10.22.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_20.10.21-dind-alpine3.17/dockerd-entrypoint.sh b/docker_20.10.22-dind-alpine3.17/dockerd-entrypoint.sh
similarity index 100%
rename from docker_20.10.21-dind-alpine3.17/dockerd-entrypoint.sh
rename to docker_20.10.22-dind-alpine3.17/dockerd-entrypoint.sh
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 df63fa5..ce7f616 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.0
+ENV DOCKER_COMPOSE_VERSION 2.14.1
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-x86_64'; \
- sha256='fdf634ab2b01aca33372bef2bf866699ef2e1f2dab19972e37967b1fc2a11402'; \
+ url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-x86_64'; \
+ sha256='e0c916bd108c49830c7847e416787387398f97de8dda7c1c35dad59438692664'; \
;; \
'armhf') \
- url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv6'; \
- sha256='63e0826ddebc1ae776f38ab872b41f68b48fca246cdf67c709e07eef543cdf88'; \
+ url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv6'; \
+ sha256='7345474ef0ce498a9e7befb14679d8ba86b8a03e81072cd9cfa4e0345b2eb1d6'; \
;; \
'armv7') \
- url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-armv7'; \
- sha256='c1664c4dcefc2a56a4f16f4dbd76e531f237bfbf713b90d3acea50df42a1aada'; \
+ url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-armv7'; \
+ sha256='4f283a2341f8faa9dd58fd68ffa45bc4909051ab8d8f376998155ec0a3d4123e'; \
;; \
'aarch64') \
- url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-aarch64'; \
- sha256='0265f45b30f4f0e1d53c1968c590181f64c546129d967460de382c6de38af191'; \
+ url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-aarch64'; \
+ sha256='49924009641e9a60f178b4085c9d308bb726b5ae74eed46c5d1a7dbc8f04948b'; \
;; \
'ppc64le') \
- url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-ppc64le'; \
- sha256='dbee58426af567787e5c1d14e925cca0d0a958edc55203c4b29c10dda8e27355'; \
+ url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-ppc64le'; \
+ sha256='6699d98c002532f719954ecf8737dfed39d0fd079c71438f04fe0ee63d23f0f1'; \
;; \
'riscv64') \
- url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-riscv64'; \
- sha256='d447a75ff4d900b19d40e0c69811b335518f8a5fbc6377e0aff25a3b999a8c49'; \
+ url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-riscv64'; \
+ sha256='c5a51c7db8b8008d4645241d917afbbb752829753c83858e030154e8c541d827'; \
;; \
's390x') \
- url='https://github.com/docker/compose/releases/download/v2.14.0/docker-compose-linux-s390x'; \
- sha256='2c5bbb6513d7377919bd4189f25d8bf5d8706a5345f10609d8c49d5cf4d8ab88'; \
+ url='https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-linux-s390x'; \
+ sha256='44b132059a2162834e7f7c285362f5a007f2569943496cc1656cce8aaea0dd2b'; \
;; \
*) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \
esac; \
diff --git a/docker_dind-rootless/Dockerfile b/docker_dind-rootless/Dockerfile
index 0812159..f8dfcfa 100644
--- a/docker_dind-rootless/Dockerfile
+++ b/docker_dind-rootless/Dockerfile
@@ -24,10 +24,10 @@ RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.21.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.22.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.21.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.22.tgz'; \
;; \
*) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_windowsservercore-1809/Dockerfile b/docker_windowsservercore-1809/Dockerfile
index 23ae361..2e26f59 100644
--- a/docker_windowsservercore-1809/Dockerfile
+++ b/docker_windowsservercore-1809/Dockerfile
@@ -15,8 +15,8 @@ RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
# doing this first to share cache across versions more aggressively
-ENV DOCKER_VERSION 20.10.21
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.21.zip
+ENV DOCKER_VERSION 20.10.22
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.22.zip
# TODO ENV DOCKER_SHA256
# https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !!
# (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though)
diff --git a/docker_windowsservercore-ltsc2022/Dockerfile b/docker_windowsservercore-ltsc2022/Dockerfile
index 13ae524..fbd12d2 100644
--- a/docker_windowsservercore-ltsc2022/Dockerfile
+++ b/docker_windowsservercore-ltsc2022/Dockerfile
@@ -15,8 +15,8 @@ RUN $newPath = ('{0}\docker;{1}' -f $env:ProgramFiles, $env:PATH); \
[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
# doing this first to share cache across versions more aggressively
-ENV DOCKER_VERSION 20.10.21
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.21.zip
+ENV DOCKER_VERSION 20.10.22
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-20.10.22.zip
# TODO ENV DOCKER_SHA256
# https://github.com/docker/docker-ce/blob/5b073ee2cf564edee5adca05eee574142f7627bb/components/packaging/static/hash_files !!
# (no SHA file artifacts on download.docker.com yet as of 2017-06-07 though)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: