Update docker #13812
Merged
Update docker #13812
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@023a45d: Update 23.0-rc to 23.0.0-rc.1 - docker-library/docker@811de88: Update generated README
Diff for ba71c5a:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 59dd325..799fbd7 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -35,36 +35,36 @@ 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
+Tags: 23.0.0-rc.1-cli, 23.0-rc-cli, rc-cli, 23.0.0-rc.1-cli-alpine3.17
Architectures: amd64, arm64v8
-GitCommit: 7dc92d7c5555cedf97411b179c617ef2781a06bd
+GitCommit: 023a45d6e2a9009fdf01da87499c6f9ca6e27bef
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
+Tags: 23.0.0-rc.1-dind, 23.0-rc-dind, rc-dind, 23.0.0-rc.1-dind-alpine3.17, 23.0.0-rc.1, 23.0-rc, rc, 23.0.0-rc.1-alpine3.17
Architectures: amd64, arm64v8
-GitCommit: c608944bf9422f7cd70951b9519866495b81e76d
+GitCommit: 023a45d6e2a9009fdf01da87499c6f9ca6e27bef
Directory: 23.0-rc/dind
-Tags: 23.0.0-beta.1-dind-rootless, 23.0-rc-dind-rootless, rc-dind-rootless
+Tags: 23.0.0-rc.1-dind-rootless, 23.0-rc-dind-rootless, rc-dind-rootless
Architectures: amd64, arm64v8
-GitCommit: c608944bf9422f7cd70951b9519866495b81e76d
+GitCommit: 023a45d6e2a9009fdf01da87499c6f9ca6e27bef
Directory: 23.0-rc/dind-rootless
-Tags: 23.0.0-beta.1-git, 23.0-rc-git, rc-git
+Tags: 23.0.0-rc.1-git, 23.0-rc-git, rc-git
Architectures: amd64, arm64v8
GitCommit: c608944bf9422f7cd70951b9519866495b81e76d
Directory: 23.0-rc/git
-Tags: 23.0.0-beta.1-windowsservercore-1809, 23.0-rc-windowsservercore-1809, rc-windowsservercore-1809
-SharedTags: 23.0.0-beta.1-windowsservercore, 23.0-rc-windowsservercore, rc-windowsservercore
+Tags: 23.0.0-rc.1-windowsservercore-1809, 23.0-rc-windowsservercore-1809, rc-windowsservercore-1809
+SharedTags: 23.0.0-rc.1-windowsservercore, 23.0-rc-windowsservercore, rc-windowsservercore
Architectures: windows-amd64
-GitCommit: c608944bf9422f7cd70951b9519866495b81e76d
+GitCommit: 023a45d6e2a9009fdf01da87499c6f9ca6e27bef
Directory: 23.0-rc/windows/windowsservercore-1809
Constraints: windowsservercore-1809
-Tags: 23.0.0-beta.1-windowsservercore-ltsc2022, 23.0-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
-SharedTags: 23.0.0-beta.1-windowsservercore, 23.0-rc-windowsservercore, rc-windowsservercore
+Tags: 23.0.0-rc.1-windowsservercore-ltsc2022, 23.0-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
+SharedTags: 23.0.0-rc.1-windowsservercore, 23.0-rc-windowsservercore, rc-windowsservercore
Architectures: windows-amd64
-GitCommit: c608944bf9422f7cd70951b9519866495b81e76d
+GitCommit: 023a45d6e2a9009fdf01da87499c6f9ca6e27bef
Directory: 23.0-rc/windows/windowsservercore-ltsc2022
Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index ef1520c..a01a383 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-beta.1
-docker:23.0.0-beta.1-alpine3.17
-docker:23.0.0-beta.1-cli
-docker:23.0.0-beta.1-cli-alpine3.17
-docker:23.0.0-beta.1-dind
-docker:23.0.0-beta.1-dind-alpine3.17
-docker:23.0.0-beta.1-dind-rootless
-docker:23.0.0-beta.1-git
-docker:23.0.0-beta.1-windowsservercore
-docker:23.0.0-beta.1-windowsservercore-1809
-docker:23.0.0-beta.1-windowsservercore-ltsc2022
+docker:23.0.0-rc.1
+docker:23.0.0-rc.1-alpine3.17
+docker:23.0.0-rc.1-cli
+docker:23.0.0-rc.1-cli-alpine3.17
+docker:23.0.0-rc.1-dind
+docker:23.0.0-rc.1-dind-alpine3.17
+docker:23.0.0-rc.1-dind-rootless
+docker:23.0.0-rc.1-git
+docker:23.0.0-rc.1-windowsservercore
+docker:23.0.0-rc.1-windowsservercore-1809
+docker:23.0.0-rc.1-windowsservercore-ltsc2022
docker:cli
docker:dind
docker:dind-rootless
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 835b69c..9dd5643 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-beta.1-cli-alpine3.17
-docker:23.0.0-beta.1-alpine3.17
+docker:23.0.0-rc.1-cli-alpine3.17
+docker:23.0.0-rc.1-alpine3.17
docker:rc-dind-rootless
docker:rc-git
docker:rc-windowsservercore-1809
diff --git a/docker_23.0.0-beta.1-alpine3.17/Dockerfile b/docker_23.0.0-rc.1-alpine3.17/Dockerfile
similarity index 96%
rename from docker_23.0.0-beta.1-alpine3.17/Dockerfile
rename to docker_23.0.0-rc.1-alpine3.17/Dockerfile
index d42fe8c..cdb8694 100644
--- a/docker_23.0.0-beta.1-alpine3.17/Dockerfile
+++ b/docker_23.0.0-rc.1-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-beta.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.1.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-beta.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.1.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-beta.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-beta.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_23.0.0-beta.1-alpine3.17/dockerd-entrypoint.sh b/docker_23.0.0-rc.1-alpine3.17/dockerd-entrypoint.sh
similarity index 100%
rename from docker_23.0.0-beta.1-alpine3.17/dockerd-entrypoint.sh
rename to docker_23.0.0-rc.1-alpine3.17/dockerd-entrypoint.sh
diff --git a/docker_23.0.0-beta.1-cli-alpine3.17/Dockerfile b/docker_23.0.0-rc.1-cli-alpine3.17/Dockerfile
similarity index 97%
rename from docker_23.0.0-beta.1-cli-alpine3.17/Dockerfile
rename to docker_23.0.0-rc.1-cli-alpine3.17/Dockerfile
index 589f8e4..9efbde8 100644
--- a/docker_23.0.0-beta.1-cli-alpine3.17/Dockerfile
+++ b/docker_23.0.0-rc.1-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-beta.1
+ENV DOCKER_VERSION 23.0.0-rc.1
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-beta.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/x86_64/docker-23.0.0-rc.1.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-beta.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/armel/docker-23.0.0-rc.1.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-beta.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/armhf/docker-23.0.0-rc.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-beta.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/aarch64/docker-23.0.0-rc.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_23.0.0-beta.1-cli-alpine3.17/docker-entrypoint.sh b/docker_23.0.0-rc.1-cli-alpine3.17/docker-entrypoint.sh
similarity index 100%
rename from docker_23.0.0-beta.1-cli-alpine3.17/docker-entrypoint.sh
rename to docker_23.0.0-rc.1-cli-alpine3.17/docker-entrypoint.sh
diff --git a/docker_23.0.0-beta.1-cli-alpine3.17/modprobe.sh b/docker_23.0.0-rc.1-cli-alpine3.17/modprobe.sh
similarity index 100%
rename from docker_23.0.0-beta.1-cli-alpine3.17/modprobe.sh
rename to docker_23.0.0-rc.1-cli-alpine3.17/modprobe.sh
diff --git a/docker_rc-dind-rootless/Dockerfile b/docker_rc-dind-rootless/Dockerfile
index e1932a5..9e77a9a 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-beta.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-23.0.0-rc.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-beta.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-23.0.0-rc.1.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 fadc21c..9b09dee 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-beta.1
-ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-beta.1.zip
+ENV DOCKER_VERSION 23.0.0-rc.1
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.1.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 c4a7398..e8083aa 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-beta.1
-ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-beta.1.zip
+ENV DOCKER_VERSION 23.0.0-rc.1
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-23.0.0-rc.1.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: