Update docker #17937
Merged
Update docker #17937
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@8dbed50: Update 27-rc to 27.4.0-rc.2
Diff for a756dba:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 57a1e0e..e472ebb 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -33,33 +33,33 @@ Directory: 27/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
-Tags: 27.4.0-rc.1-cli, 27-rc-cli, rc-cli, 27.4.0-rc.1-cli-alpine3.20
+Tags: 27.4.0-rc.2-cli, 27-rc-cli, rc-cli, 27.4.0-rc.2-cli-alpine3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: ad57caf9179715e19c7e5058940f8936807fffe4
+GitCommit: 8dbed50d0e0d056458139f6e5eaa5629b589a4ef
Directory: 27-rc/cli
-Tags: 27.4.0-rc.1-dind, 27-rc-dind, rc-dind, 27.4.0-rc.1-dind-alpine3.20, 27.4.0-rc.1, 27-rc, rc, 27.4.0-rc.1-alpine3.20
+Tags: 27.4.0-rc.2-dind, 27-rc-dind, rc-dind, 27.4.0-rc.2-dind-alpine3.20, 27.4.0-rc.2, 27-rc, rc, 27.4.0-rc.2-alpine3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: ad57caf9179715e19c7e5058940f8936807fffe4
+GitCommit: 8dbed50d0e0d056458139f6e5eaa5629b589a4ef
Directory: 27-rc/dind
-Tags: 27.4.0-rc.1-dind-rootless, 27-rc-dind-rootless, rc-dind-rootless
+Tags: 27.4.0-rc.2-dind-rootless, 27-rc-dind-rootless, rc-dind-rootless
Architectures: amd64, arm64v8
-GitCommit: ad57caf9179715e19c7e5058940f8936807fffe4
+GitCommit: 8dbed50d0e0d056458139f6e5eaa5629b589a4ef
Directory: 27-rc/dind-rootless
-Tags: 27.4.0-rc.1-windowsservercore-1809, 27-rc-windowsservercore-1809, rc-windowsservercore-1809
-SharedTags: 27.4.0-rc.1-windowsservercore, 27-rc-windowsservercore, rc-windowsservercore
+Tags: 27.4.0-rc.2-windowsservercore-1809, 27-rc-windowsservercore-1809, rc-windowsservercore-1809
+SharedTags: 27.4.0-rc.2-windowsservercore, 27-rc-windowsservercore, rc-windowsservercore
Architectures: windows-amd64
-GitCommit: ad57caf9179715e19c7e5058940f8936807fffe4
+GitCommit: 8dbed50d0e0d056458139f6e5eaa5629b589a4ef
Directory: 27-rc/windows/windowsservercore-1809
Builder: classic
Constraints: windowsservercore-1809
-Tags: 27.4.0-rc.1-windowsservercore-ltsc2022, 27-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
-SharedTags: 27.4.0-rc.1-windowsservercore, 27-rc-windowsservercore, rc-windowsservercore
+Tags: 27.4.0-rc.2-windowsservercore-ltsc2022, 27-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
+SharedTags: 27.4.0-rc.2-windowsservercore, 27-rc-windowsservercore, rc-windowsservercore
Architectures: windows-amd64
-GitCommit: ad57caf9179715e19c7e5058940f8936807fffe4
+GitCommit: 8dbed50d0e0d056458139f6e5eaa5629b589a4ef
Directory: 27-rc/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index bedc9a4..f6e0215 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -29,16 +29,16 @@ docker:27.3.1-dind-rootless
docker:27.3.1-windowsservercore
docker:27.3.1-windowsservercore-1809
docker:27.3.1-windowsservercore-ltsc2022
-docker:27.4.0-rc.1
-docker:27.4.0-rc.1-alpine3.20
-docker:27.4.0-rc.1-cli
-docker:27.4.0-rc.1-cli-alpine3.20
-docker:27.4.0-rc.1-dind
-docker:27.4.0-rc.1-dind-alpine3.20
-docker:27.4.0-rc.1-dind-rootless
-docker:27.4.0-rc.1-windowsservercore
-docker:27.4.0-rc.1-windowsservercore-1809
-docker:27.4.0-rc.1-windowsservercore-ltsc2022
+docker:27.4.0-rc.2
+docker:27.4.0-rc.2-alpine3.20
+docker:27.4.0-rc.2-cli
+docker:27.4.0-rc.2-cli-alpine3.20
+docker:27.4.0-rc.2-dind
+docker:27.4.0-rc.2-dind-alpine3.20
+docker:27.4.0-rc.2-dind-rootless
+docker:27.4.0-rc.2-windowsservercore
+docker:27.4.0-rc.2-windowsservercore-1809
+docker:27.4.0-rc.2-windowsservercore-ltsc2022
docker:cli
docker:dind
docker:dind-rootless
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 1e7564d..f5d8a2e 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,10 +1,10 @@
docker:27.3.1-cli-alpine3.20
-docker:27.4.0-rc.1-cli-alpine3.20
+docker:27.4.0-rc.2-cli-alpine3.20
docker:rc-windowsservercore-1809
docker:rc-windowsservercore-ltsc2022
docker:windowsservercore-1809
docker:windowsservercore-ltsc2022
docker:27.3.1-alpine3.20
-docker:27.4.0-rc.1-alpine3.20
+docker:27.4.0-rc.2-alpine3.20
docker:dind-rootless
docker:rc-dind-rootless
diff --git a/docker_27.4.0-rc.1-alpine3.20/Dockerfile b/docker_27.4.0-rc.2-alpine3.20/Dockerfile
similarity index 97%
rename from docker_27.4.0-rc.1-alpine3.20/Dockerfile
rename to docker_27.4.0-rc.2-alpine3.20/Dockerfile
index 1284459..040d1ca 100644
--- a/docker_27.4.0-rc.1-alpine3.20/Dockerfile
+++ b/docker_27.4.0-rc.2-alpine3.20/Dockerfile
@@ -61,16 +61,16 @@ RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.2.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.2.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.2.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.2.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_27.4.0-rc.1-alpine3.20/dockerd-entrypoint.sh b/docker_27.4.0-rc.2-alpine3.20/dockerd-entrypoint.sh
similarity index 100%
rename from docker_27.4.0-rc.1-alpine3.20/dockerd-entrypoint.sh
rename to docker_27.4.0-rc.2-alpine3.20/dockerd-entrypoint.sh
diff --git a/docker_27.4.0-rc.1-cli-alpine3.20/Dockerfile b/docker_27.4.0-rc.2-cli-alpine3.20/Dockerfile
similarity index 98%
rename from docker_27.4.0-rc.1-cli-alpine3.20/Dockerfile
rename to docker_27.4.0-rc.2-cli-alpine3.20/Dockerfile
index a3c9f66..5ee555b 100644
--- a/docker_27.4.0-rc.1-cli-alpine3.20/Dockerfile
+++ b/docker_27.4.0-rc.2-cli-alpine3.20/Dockerfile
@@ -23,23 +23,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf
RUN set -eux; \
addgroup -g 2375 -S docker
-ENV DOCKER_VERSION 27.4.0-rc.1
+ENV DOCKER_VERSION 27.4.0-rc.2
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/x86_64/docker-27.4.0-rc.2.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/armel/docker-27.4.0-rc.2.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/armhf/docker-27.4.0-rc.2.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/aarch64/docker-27.4.0-rc.2.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_27.4.0-rc.1-cli-alpine3.20/docker-entrypoint.sh b/docker_27.4.0-rc.2-cli-alpine3.20/docker-entrypoint.sh
similarity index 100%
rename from docker_27.4.0-rc.1-cli-alpine3.20/docker-entrypoint.sh
rename to docker_27.4.0-rc.2-cli-alpine3.20/docker-entrypoint.sh
diff --git a/docker_27.4.0-rc.1-cli-alpine3.20/modprobe.sh b/docker_27.4.0-rc.2-cli-alpine3.20/modprobe.sh
similarity index 100%
rename from docker_27.4.0-rc.1-cli-alpine3.20/modprobe.sh
rename to docker_27.4.0-rc.2-cli-alpine3.20/modprobe.sh
diff --git a/docker_rc-dind-rootless/Dockerfile b/docker_rc-dind-rootless/Dockerfile
index 0b614bf..1968f21 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-27.4.0-rc.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.4.0-rc.2.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.4.0-rc.2.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 0534a06..dd26c75 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 27.4.0-rc.1
-ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.1.zip
+ENV DOCKER_VERSION 27.4.0-rc.2
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.2.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 13af56d..02b658b 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 27.4.0-rc.1
-ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.1.zip
+ENV DOCKER_VERSION 27.4.0-rc.2
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.4.0-rc.2.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: |
yosifkit
approved these changes
Nov 19, 2024
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: