Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update docker #18162

Merged
merged 1 commit into from
Dec 24, 2024
Merged

Update docker #18162

merged 1 commit into from
Dec 24, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Dec 24, 2024

Changes:

@docker-library-bot
Update docker
0fb94e4 
Changes:

- docker-library/docker@982bc8b: Update 27-rc to 27.5.0-rc.1, buildx 0.19.3, compose 2.32.1
@tianon tianon requested review from LaurentGoderre and a team as code owners December 24, 2024 07:11
@github-actions GitHub Actions
Copy link

Diff for 0fb94e4: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index e5d2689..8095557 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -32,3 +32,34 @@ GitCommit: 1188b8d14e45467307857b8fa3196f07b3826f50
 Directory: 27/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
+
+Tags: 27.5.0-rc.1-cli, 27-rc-cli, rc-cli, 27.5.0-rc.1-cli-alpine3.21
+Architectures: amd64, arm32v6, arm32v7, arm64v8
+GitCommit: 982bc8b4002d8c38372ef646d034ce7ca592f82a
+Directory: 27-rc/cli
+
+Tags: 27.5.0-rc.1-dind, 27-rc-dind, rc-dind, 27.5.0-rc.1-dind-alpine3.21, 27.5.0-rc.1, 27-rc, rc, 27.5.0-rc.1-alpine3.21
+Architectures: amd64, arm32v6, arm32v7, arm64v8
+GitCommit: 982bc8b4002d8c38372ef646d034ce7ca592f82a
+Directory: 27-rc/dind
+
+Tags: 27.5.0-rc.1-dind-rootless, 27-rc-dind-rootless, rc-dind-rootless
+Architectures: amd64, arm64v8
+GitCommit: 982bc8b4002d8c38372ef646d034ce7ca592f82a
+Directory: 27-rc/dind-rootless
+
+Tags: 27.5.0-rc.1-windowsservercore-1809, 27-rc-windowsservercore-1809, rc-windowsservercore-1809
+SharedTags: 27.5.0-rc.1-windowsservercore, 27-rc-windowsservercore, rc-windowsservercore
+Architectures: windows-amd64
+GitCommit: 982bc8b4002d8c38372ef646d034ce7ca592f82a
+Directory: 27-rc/windows/windowsservercore-1809
+Builder: classic
+Constraints: windowsservercore-1809
+
+Tags: 27.5.0-rc.1-windowsservercore-ltsc2022, 27-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
+SharedTags: 27.5.0-rc.1-windowsservercore, 27-rc-windowsservercore, rc-windowsservercore
+Architectures: windows-amd64
+GitCommit: 982bc8b4002d8c38372ef646d034ce7ca592f82a
+Directory: 27-rc/windows/windowsservercore-ltsc2022
+Builder: classic
+Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 55376b8..a0a377f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,6 +2,13 @@ docker:27
 docker:27-cli
 docker:27-dind
 docker:27-dind-rootless
+docker:27-rc
+docker:27-rc-cli
+docker:27-rc-dind
+docker:27-rc-dind-rootless
+docker:27-rc-windowsservercore
+docker:27-rc-windowsservercore-1809
+docker:27-rc-windowsservercore-ltsc2022
 docker:27-windowsservercore
 docker:27-windowsservercore-1809
 docker:27-windowsservercore-ltsc2022
@@ -22,10 +29,27 @@ docker:27.4.1-dind-rootless
 docker:27.4.1-windowsservercore
 docker:27.4.1-windowsservercore-1809
 docker:27.4.1-windowsservercore-ltsc2022
+docker:27.5.0-rc.1
+docker:27.5.0-rc.1-alpine3.21
+docker:27.5.0-rc.1-cli
+docker:27.5.0-rc.1-cli-alpine3.21
+docker:27.5.0-rc.1-dind
+docker:27.5.0-rc.1-dind-alpine3.21
+docker:27.5.0-rc.1-dind-rootless
+docker:27.5.0-rc.1-windowsservercore
+docker:27.5.0-rc.1-windowsservercore-1809
+docker:27.5.0-rc.1-windowsservercore-ltsc2022
 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:windowsservercore
 docker:windowsservercore-1809
 docker:windowsservercore-ltsc2022
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 534b79a..c1c6a18 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,5 +1,10 @@
 docker:27.4.1-cli-alpine3.21
+docker:27.5.0-rc.1-cli-alpine3.21
+docker:rc-windowsservercore-1809
+docker:rc-windowsservercore-ltsc2022
 docker:windowsservercore-1809
 docker:windowsservercore-ltsc2022
 docker:27.4.1-alpine3.21
+docker:27.5.0-rc.1-alpine3.21
 docker:dind-rootless
+docker:rc-dind-rootless
diff --git a/docker_27.4.1-alpine3.21/Dockerfile b/docker_27.5.0-rc.1-alpine3.21/Dockerfile
similarity index 85%
copy from docker_27.4.1-alpine3.21/Dockerfile
copy to docker_27.5.0-rc.1-alpine3.21/Dockerfile
index 6bbd755..38bb266 100644
--- a/docker_27.4.1-alpine3.21/Dockerfile
+++ b/docker_27.5.0-rc.1-alpine3.21/Dockerfile
@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM docker:27-cli
+FROM docker:27-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.4.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/x86_64/docker-27.5.0-rc.1.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/stable/armel/docker-27.4.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/armel/docker-27.5.0-rc.1.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/stable/armhf/docker-27.4.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/armhf/docker-27.5.0-rc.1.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/stable/aarch64/docker-27.4.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/aarch64/docker-27.5.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:27-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.4.1-alpine3.21/dockerd-entrypoint.sh b/docker_27.5.0-rc.1-alpine3.21/dockerd-entrypoint.sh
similarity index 100%
copy from docker_27.4.1-alpine3.21/dockerd-entrypoint.sh
copy to docker_27.5.0-rc.1-alpine3.21/dockerd-entrypoint.sh
diff --git a/docker_27.4.1-cli-alpine3.21/Dockerfile b/docker_27.5.0-rc.1-cli-alpine3.21/Dockerfile
similarity index 94%
copy from docker_27.4.1-cli-alpine3.21/Dockerfile
copy to docker_27.5.0-rc.1-cli-alpine3.21/Dockerfile
index 09db452..7c4939d 100644
--- a/docker_27.4.1-cli-alpine3.21/Dockerfile
+++ b/docker_27.5.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.4.1
+ENV DOCKER_VERSION 27.5.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.4.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/x86_64/docker-27.5.0-rc.1.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/stable/armel/docker-27.4.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/armel/docker-27.5.0-rc.1.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/stable/armhf/docker-27.4.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/armhf/docker-27.5.0-rc.1.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/stable/aarch64/docker-27.4.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/aarch64/docker-27.5.0-rc.1.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_27.4.1-cli-alpine3.21/docker-entrypoint.sh b/docker_27.5.0-rc.1-cli-alpine3.21/docker-entrypoint.sh
similarity index 100%
copy from docker_27.4.1-cli-alpine3.21/docker-entrypoint.sh
copy to docker_27.5.0-rc.1-cli-alpine3.21/docker-entrypoint.sh
diff --git a/docker_27.4.1-cli-alpine3.21/modprobe.sh b/docker_27.5.0-rc.1-cli-alpine3.21/modprobe.sh
similarity index 100%
copy from docker_27.4.1-cli-alpine3.21/modprobe.sh
copy to docker_27.5.0-rc.1-cli-alpine3.21/modprobe.sh
diff --git a/docker_dind-rootless/Dockerfile b/docker_rc-dind-rootless/Dockerfile
similarity index 86%
copy from docker_dind-rootless/Dockerfile
copy to docker_rc-dind-rootless/Dockerfile
index 7f05598..d7b7af9 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:27-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.4.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-27.5.0-rc.1.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.4.1.tgz'; \
+			url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-27.5.0-rc.1.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
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 343a43d..9b828b6 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.4.1
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.4.1.zip
+ENV DOCKER_VERSION 27.5.0-rc.1
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.5.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 2f36956..ee8c23c 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.4.1
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.4.1.zip
+ENV DOCKER_VERSION 27.5.0-rc.1
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-27.5.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:

@tianon tianon merged commit ed39426 into docker-library:master Dec 24, 2024
11 checks passed
@tianon tianon deleted the docker branch December 24, 2024 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LaurentGoderre LaurentGoderre Awaiting requested review from LaurentGoderre LaurentGoderre is a code owner

Assignees
No one assigned
Labels
library/docker
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tianon @docker-library-bot