Update docker #18404
Merged
Update docker #18404
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@aa838c1: Merge pull request docker-library/docker#525 from infosiftr/28 - docker-library/docker@b329937: Add 28.0.0-rc.1
Diff for 6111e7d:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6dc817a..25ba769 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -40,3 +40,42 @@ GitCommit: 9af9a06de75a33816897ae7285fcb5104c5d9f83
Directory: 27/windows/windowsservercore-ltsc2025
Builder: classic
Constraints: windowsservercore-ltsc2025
+
+Tags: 28.0.0-rc.1-cli, 28-rc-cli, rc-cli, 28.0.0-rc.1-cli-alpine3.21
+Architectures: amd64, arm32v6, arm32v7, arm64v8
+GitCommit: b329937b7efdb0ef4a6724a461529e36770aecb6
+Directory: 28-rc/cli
+
+Tags: 28.0.0-rc.1-dind, 28-rc-dind, rc-dind, 28.0.0-rc.1-dind-alpine3.21, 28.0.0-rc.1, 28-rc, rc, 28.0.0-rc.1-alpine3.21
+Architectures: amd64, arm32v6, arm32v7, arm64v8
+GitCommit: b329937b7efdb0ef4a6724a461529e36770aecb6
+Directory: 28-rc/dind
+
+Tags: 28.0.0-rc.1-dind-rootless, 28-rc-dind-rootless, rc-dind-rootless
+Architectures: amd64, arm64v8
+GitCommit: b329937b7efdb0ef4a6724a461529e36770aecb6
+Directory: 28-rc/dind-rootless
+
+Tags: 28.0.0-rc.1-windowsservercore-1809, 28-rc-windowsservercore-1809, rc-windowsservercore-1809
+SharedTags: 28.0.0-rc.1-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
+Architectures: windows-amd64
+GitCommit: b329937b7efdb0ef4a6724a461529e36770aecb6
+Directory: 28-rc/windows/windowsservercore-1809
+Builder: classic
+Constraints: windowsservercore-1809
+
+Tags: 28.0.0-rc.1-windowsservercore-ltsc2022, 28-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
+SharedTags: 28.0.0-rc.1-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
+Architectures: windows-amd64
+GitCommit: b329937b7efdb0ef4a6724a461529e36770aecb6
+Directory: 28-rc/windows/windowsservercore-ltsc2022
+Builder: classic
+Constraints: windowsservercore-ltsc2022
+
+Tags: 28.0.0-rc.1-windowsservercore-ltsc2025, 28-rc-windowsservercore-ltsc2025, rc-windowsservercore-ltsc2025
+SharedTags: 28.0.0-rc.1-windowsservercore, 28-rc-windowsservercore, rc-windowsservercore
+Architectures: windows-amd64
+GitCommit: b329937b7efdb0ef4a6724a461529e36770aecb6
+Directory: 28-rc/windows/windowsservercore-ltsc2025
+Builder: classic
+Constraints: windowsservercore-ltsc2025
diff --git a/_bashbrew-list b/_bashbrew-list
index 5a8473d..36a2b12 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -25,10 +25,37 @@ docker:27.5.1-windowsservercore
docker:27.5.1-windowsservercore-1809
docker:27.5.1-windowsservercore-ltsc2022
docker:27.5.1-windowsservercore-ltsc2025
+docker:28-rc
+docker:28-rc-cli
+docker:28-rc-dind
+docker:28-rc-dind-rootless
+docker:28-rc-windowsservercore
+docker:28-rc-windowsservercore-1809
+docker:28-rc-windowsservercore-ltsc2022
+docker:28-rc-windowsservercore-ltsc2025
+docker:28.0.0-rc.1
+docker:28.0.0-rc.1-alpine3.21
+docker:28.0.0-rc.1-cli
+docker:28.0.0-rc.1-cli-alpine3.21
+docker:28.0.0-rc.1-dind
+docker:28.0.0-rc.1-dind-alpine3.21
+docker:28.0.0-rc.1-dind-rootless
+docker:28.0.0-rc.1-windowsservercore
+docker:28.0.0-rc.1-windowsservercore-1809
+docker:28.0.0-rc.1-windowsservercore-ltsc2022
+docker:28.0.0-rc.1-windowsservercore-ltsc2025
docker:cli
docker:dind
docker:dind-rootless
docker:latest
+docker:rc
+docker:rc-cli
+docker:rc-dind
+docker:rc-dind-rootless
+docker:rc-windowsservercore
+docker:rc-windowsservercore-1809
+docker:rc-windowsservercore-ltsc2022
+docker:rc-windowsservercore-ltsc2025
docker:windowsservercore
docker:windowsservercore-1809
docker:windowsservercore-ltsc2022
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index c005074..d1dc5f6 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,6 +1,12 @@
docker:27.5.1-cli-alpine3.21
+docker:28.0.0-rc.1-cli-alpine3.21
+docker:rc-windowsservercore-1809
+docker:rc-windowsservercore-ltsc2022
+docker:rc-windowsservercore-ltsc2025
docker:windowsservercore-1809
docker:windowsservercore-ltsc2022
docker:windowsservercore-ltsc2025
docker:27.5.1-alpine3.21
+docker:28.0.0-rc.1-alpine3.21
docker:dind-rootless
+docker:rc-dind-rootless
diff --git a/docker_27.5.1-alpine3.21/Dockerfile b/docker_28.0.0-rc.1-alpine3.21/Dockerfile
similarity index 85%
copy from docker_27.5.1-alpine3.21/Dockerfile
copy to docker_28.0.0-rc.1-alpine3.21/Dockerfile
index 9436571..c457b7f 100644
--- a/docker_27.5.1-alpine3.21/Dockerfile
+++ b/docker_28.0.0-rc.1-alpine3.21/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM docker:27-cli
+FROM docker:28-rc-cli
# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies
# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41
@@ -61,16 +61,16 @@ RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/stable/x86_64/docker-27.5.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.1.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-27.5.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.1.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-27.5.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-27.5.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
@@ -82,7 +82,7 @@ RUN set -eux; \
--strip-components 1 \
--directory /usr/local/bin/ \
--no-same-owner \
-# we exclude the CLI binary because we already extracted that over in the "docker:27-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer
+# we exclude the CLI binary because we already extracted that over in the "docker:28-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer
--exclude 'docker/docker' \
; \
rm docker.tgz; \
diff --git a/docker_27.5.1-alpine3.21/dockerd-entrypoint.sh b/docker_28.0.0-rc.1-alpine3.21/dockerd-entrypoint.sh
similarity index 100%
copy from docker_27.5.1-alpine3.21/dockerd-entrypoint.sh
copy to docker_28.0.0-rc.1-alpine3.21/dockerd-entrypoint.sh
diff --git a/docker_27.5.1-cli-alpine3.21/Dockerfile b/docker_28.0.0-rc.1-cli-alpine3.21/Dockerfile
similarity index 94%
copy from docker_27.5.1-cli-alpine3.21/Dockerfile
copy to docker_28.0.0-rc.1-cli-alpine3.21/Dockerfile
index 353a13a..1dfcccc 100644
--- a/docker_27.5.1-cli-alpine3.21/Dockerfile
+++ b/docker_28.0.0-rc.1-cli-alpine3.21/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.5.1
+ENV DOCKER_VERSION 28.0.0-rc.1
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/stable/x86_64/docker-27.5.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/x86_64/docker-28.0.0-rc.1.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-27.5.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/armel/docker-28.0.0-rc.1.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-27.5.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/armhf/docker-28.0.0-rc.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-27.5.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/aarch64/docker-28.0.0-rc.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_27.5.1-cli-alpine3.21/docker-entrypoint.sh b/docker_28.0.0-rc.1-cli-alpine3.21/docker-entrypoint.sh
similarity index 100%
copy from docker_27.5.1-cli-alpine3.21/docker-entrypoint.sh
copy to docker_28.0.0-rc.1-cli-alpine3.21/docker-entrypoint.sh
diff --git a/docker_27.5.1-cli-alpine3.21/modprobe.sh b/docker_28.0.0-rc.1-cli-alpine3.21/modprobe.sh
similarity index 100%
copy from docker_27.5.1-cli-alpine3.21/modprobe.sh
copy to docker_28.0.0-rc.1-cli-alpine3.21/modprobe.sh
diff --git a/docker_dind-rootless/Dockerfile b/docker_rc-dind-rootless/Dockerfile
similarity index 83%
copy from docker_dind-rootless/Dockerfile
copy to docker_rc-dind-rootless/Dockerfile
index 73bbb50..512a058 100644
--- a/docker_dind-rootless/Dockerfile
+++ b/docker_rc-dind-rootless/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM docker:27-dind
+FROM docker:28-rc-dind
# busybox "ip" is insufficient:
# [rootlesskit:child ] error: executing [[ip tuntap add name tap0 mode tap] [ip link set tap0 address 02:50:00:00:00:01]]: exit status 1
@@ -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-27.5.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-28.0.0-rc.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.5.1.tgz'; \
+ url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-28.0.0-rc.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
@@ -39,7 +39,6 @@ RUN set -eux; \
--strip-components 1 \
--directory /usr/local/bin/ \
'docker-rootless-extras/rootlesskit' \
- 'docker-rootless-extras/rootlesskit-docker-proxy' \
'docker-rootless-extras/vpnkit' \
; \
rm rootless.tgz; \
diff --git a/docker_windowsservercore-1809/Dockerfile b/docker_rc-windowsservercore-1809/Dockerfile
similarity index 96%
copy from docker_windowsservercore-1809/Dockerfile
copy to docker_rc-windowsservercore-1809/Dockerfile
index 1b7c45e..ae5f346 100644
--- a/docker_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.5.1
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.1.zip
+ENV DOCKER_VERSION 28.0.0-rc.1
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.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_windowsservercore-ltsc2022/Dockerfile b/docker_rc-windowsservercore-ltsc2022/Dockerfile
similarity index 96%
copy from docker_windowsservercore-ltsc2022/Dockerfile
copy to docker_rc-windowsservercore-ltsc2022/Dockerfile
index 60b9f4b..e1391c2 100644
--- a/docker_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.5.1
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.1.zip
+ENV DOCKER_VERSION 28.0.0-rc.1
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.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_windowsservercore-ltsc2025/Dockerfile b/docker_rc-windowsservercore-ltsc2025/Dockerfile
similarity index 96%
copy from docker_windowsservercore-ltsc2025/Dockerfile
copy to docker_rc-windowsservercore-ltsc2025/Dockerfile
index 338d2f4..fd9ad9c 100644
--- a/docker_windowsservercore-ltsc2025/Dockerfile
+++ b/docker_rc-windowsservercore-ltsc2025/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.5.1
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.1.zip
+ENV DOCKER_VERSION 28.0.0-rc.1
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-28.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: |
yosifkit
approved these changes
Feb 10, 2025
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: