Update docker #13995
Merged
Update docker #13995
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@cb39cb2: Update 23.0-rc to 23.0.0-rc.4
Diff for 78ab7ee:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6d42c24..f5486f2 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -35,36 +35,36 @@ GitCommit: 4abc6d9dadc3876b11aac5abf84d501d7ee0d318
Directory: 20.10/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
-Tags: 23.0.0-rc.3-cli, 23.0-rc-cli, rc-cli, 23.0.0-rc.3-cli-alpine3.17
+Tags: 23.0.0-rc.4-cli, 23.0-rc-cli, rc-cli, 23.0.0-rc.4-cli-alpine3.17
Architectures: amd64, arm64v8
-GitCommit: 219095a5df21d96ea80078ef748196b9420e293a
+GitCommit: cb39cb27e89ff8ae2a30cf24acac5c1a385e62d8
Directory: 23.0-rc/cli
-Tags: 23.0.0-rc.3-dind, 23.0-rc-dind, rc-dind, 23.0.0-rc.3-dind-alpine3.17, 23.0.0-rc.3, 23.0-rc, rc, 23.0.0-rc.3-alpine3.17
+Tags: 23.0.0-rc.4-dind, 23.0-rc-dind, rc-dind, 23.0.0-rc.4-dind-alpine3.17, 23.0.0-rc.4, 23.0-rc, rc, 23.0.0-rc.4-alpine3.17
Architectures: amd64, arm64v8
-GitCommit: 7a7c807686f54b67646bc75d2c81a68f9a906dbd
+GitCommit: cb39cb27e89ff8ae2a30cf24acac5c1a385e62d8
Directory: 23.0-rc/dind
-Tags: 23.0.0-rc.3-dind-rootless, 23.0-rc-dind-rootless, rc-dind-rootless
+Tags: 23.0.0-rc.4-dind-rootless, 23.0-rc-dind-rootless, rc-dind-rootless
Architectures: amd64, arm64v8
-GitCommit: 7a7c807686f54b67646bc75d2c81a68f9a906dbd
+GitCommit: cb39cb27e89ff8ae2a30cf24acac5c1a385e62d8
Directory: 23.0-rc/dind-rootless
-Tags: 23.0.0-rc.3-git, 23.0-rc-git, rc-git
+Tags: 23.0.0-rc.4-git, 23.0-rc-git, rc-git
Architectures: amd64, arm64v8
GitCommit: c608944bf9422f7cd70951b9519866495b81e76d
Directory: 23.0-rc/git
-Tags: 23.0.0-rc.3-windowsservercore-1809, 23.0-rc-windowsservercore-1809, rc-windowsservercore-1809
-SharedTags: 23.0.0-rc.3-windowsservercore, 23.0-rc-windowsservercore, rc-windowsservercore
+Tags: 23.0.0-rc.4-windowsservercore-1809, 23.0-rc-windowsservercore-1809, rc-windowsservercore-1809
+SharedTags: 23.0.0-rc.4-windowsservercore, 23.0-rc-windowsservercore, rc-windowsservercore
Architectures: windows-amd64
-GitCommit: 7a7c807686f54b67646bc75d2c81a68f9a906dbd
+GitCommit: cb39cb27e89ff8ae2a30cf24acac5c1a385e62d8
Directory: 23.0-rc/windows/windowsservercore-1809
Constraints: windowsservercore-1809
-Tags: 23.0.0-rc.3-windowsservercore-ltsc2022, 23.0-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
-SharedTags: 23.0.0-rc.3-windowsservercore, 23.0-rc-windowsservercore, rc-windowsservercore
+Tags: 23.0.0-rc.4-windowsservercore-ltsc2022, 23.0-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
+SharedTags: 23.0.0-rc.4-windowsservercore, 23.0-rc-windowsservercore, rc-windowsservercore
Architectures: windows-amd64
-GitCommit: 7a7c807686f54b67646bc75d2c81a68f9a906dbd
+GitCommit: cb39cb27e89ff8ae2a30cf24acac5c1a385e62d8
Directory: 23.0-rc/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 4fdf783..8fd8472 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -33,17 +33,17 @@ docker:23.0-rc-git
docker:23.0-rc-windowsservercore
docker:23.0-rc-windowsservercore-1809
docker:23.0-rc-windowsservercore-ltsc2022
-docker:23.0.0-rc.3
-docker:23.0.0-rc.3-alpine3.17
-docker:23.0.0-rc.3-cli
-docker:23.0.0-rc.3-cli-alpine3.17
-docker:23.0.0-rc.3-dind
-docker:23.0.0-rc.3-dind-alpine3.17
-docker:23.0.0-rc.3-dind-rootless
-docker:23.0.0-rc.3-git
-docker:23.0.0-rc.3-windowsservercore
-docker:23.0.0-rc.3-windowsservercore-1809
-docker:23.0.0-rc.3-windowsservercore-ltsc2022
+docker:23.0.0-rc.4
+docker:23.0.0-rc.4-alpine3.17
+docker:23.0.0-rc.4-cli
+docker:23.0.0-rc.4-cli-alpine3.17
+docker:23.0.0-rc.4-dind
+docker:23.0.0-rc.4-dind-alpine3.17
+docker:23.0.0-rc.4-dind-rootless
+docker:23.0.0-rc.4-git
+docker:23.0.0-rc.4-windowsservercore
+docker:23.0.0-rc.4-windowsservercore-1809
+docker:23.0.0-rc.4-windowsservercore-ltsc2022
docker:cli
docker:dind
docker:dind-rootless
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 4c16b69..261e996 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -4,8 +4,8 @@ docker:dind-rootless
docker:git
docker:windowsservercore-1809
docker:windowsservercore-ltsc2022
-docker:23.0.0-rc.3-cli-alpine3.17
-docker:23.0.0-rc.3-alpine3.17
+docker:23.0.0-rc.4-cli-alpine3.17
+docker:23.0.0-rc.4-alpine3.17
docker:rc-dind-rootless
docker:rc-git
docker:rc-windowsservercore-1809
diff --git a/docker_23.0.0-rc.3-alpine3.17/Dockerfile b/docker_23.0.0-rc.4-alpine3.17/Dockerfile
similarity index 96%
rename from docker_23.0.0-rc.3-alpine3.17/Dockerfile
rename to docker_23.0.0-rc.4-alpine3.17/Dockerfile
index 8ce7954..de40e9a 100644
--- a/docker_23.0.0-rc.3-alpine3.17/Dockerfile
+++ b/docker_23.0.0-rc.4-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/test/x86_64/docker-23.0.0-rc.3.tgz'; \
+ url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.4.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.3.tgz'; \
+ url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.4.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.3.tgz'; \
+ url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.4.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.3.tgz'; \
+ url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.4.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_23.0.0-rc.3-alpine3.17/dockerd-entrypoint.sh b/docker_23.0.0-rc.4-alpine3.17/dockerd-entrypoint.sh
similarity index 100%
rename from docker_23.0.0-rc.3-alpine3.17/dockerd-entrypoint.sh
rename to docker_23.0.0-rc.4-alpine3.17/dockerd-entrypoint.sh
diff --git a/docker_23.0.0-rc.3-cli-alpine3.17/Dockerfile b/docker_23.0.0-rc.4-cli-alpine3.17/Dockerfile
similarity index 98%
rename from docker_23.0.0-rc.3-cli-alpine3.17/Dockerfile
rename to docker_23.0.0-rc.4-cli-alpine3.17/Dockerfile
index f120954..a4ab08a 100644
--- a/docker_23.0.0-rc.3-cli-alpine3.17/Dockerfile
+++ b/docker_23.0.0-rc.4-cli-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 23.0.0-rc.3
+ENV DOCKER_VERSION 23.0.0-rc.4
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.3.tgz'; \
+ url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.4.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.3.tgz'; \
+ url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.4.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.3.tgz'; \
+ url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.4.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.3.tgz'; \
+ url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.4.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_23.0.0-rc.3-cli-alpine3.17/docker-entrypoint.sh b/docker_23.0.0-rc.4-cli-alpine3.17/docker-entrypoint.sh
similarity index 100%
rename from docker_23.0.0-rc.3-cli-alpine3.17/docker-entrypoint.sh
rename to docker_23.0.0-rc.4-cli-alpine3.17/docker-entrypoint.sh
diff --git a/docker_23.0.0-rc.3-cli-alpine3.17/modprobe.sh b/docker_23.0.0-rc.4-cli-alpine3.17/modprobe.sh
similarity index 100%
rename from docker_23.0.0-rc.3-cli-alpine3.17/modprobe.sh
rename to docker_23.0.0-rc.4-cli-alpine3.17/modprobe.sh
diff --git a/docker_rc-dind-rootless/Dockerfile b/docker_rc-dind-rootless/Dockerfile
index f3db231..2aef497 100644
--- a/docker_rc-dind-rootless/Dockerfile
+++ b/docker_rc-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/test/x86_64/docker-rootless-extras-23.0.0-rc.3.tgz'; \
+ url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-rc.4.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.3.tgz'; \
+ url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.4.tgz'; \
;; \
*) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_rc-windowsservercore-1809/Dockerfile b/docker_rc-windowsservercore-1809/Dockerfile
index 627f822..51cf213 100644
--- a/docker_rc-windowsservercore-1809/Dockerfile
+++ b/docker_rc-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 23.0.0-rc.3
-ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.3.zip
+ENV DOCKER_VERSION 23.0.0-rc.4
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.4.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_rc-windowsservercore-ltsc2022/Dockerfile b/docker_rc-windowsservercore-ltsc2022/Dockerfile
index 1d09744..92a827e 100644
--- a/docker_rc-windowsservercore-ltsc2022/Dockerfile
+++ b/docker_rc-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 23.0.0-rc.3
-ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.3.zip
+ENV DOCKER_VERSION 23.0.0-rc.4
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.4.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: