Update docker #15943

yosifkit · 2023-12-19T23:57:35Z

Changes:

docker-library/docker@3a04248: (temporarily) Revert "Add a "docker" group (with GID 2375)"
docker-library/docker@8f1087c: Update 25-rc to 25.0.0-beta.3
docker-library/docker@9238e26: Merge pull request Add a "docker" group docker#462 from infosiftr/docker-group

tianon · 2023-12-21T19:14:16Z

Hmm, docker-library/docker#462 is a good change, but I do worry about merging it right before our holiday break when we won't even see any breakage until 2024.

@thaJeztah do you have an opinion on whether we should just delay releasing the beta 3 image until 2024 or whether we should temporarily revert the docker group to get the pre-release out?

thaJeztah · 2023-12-21T21:28:37Z

I'm good with temporarily reverting the docker group; it was not critical in any way. It'd be nice to have the beta out (which should not affect any production use), allowing people to give it a try

Changes: - docker-library/docker@3a04248: (temporarily) Revert "Add a "docker" group (with GID 2375)" - docker-library/docker@8f1087c: Update 25-rc to 25.0.0-beta.3 - docker-library/docker@9238e26: Merge pull request docker-library/docker#462 from infosiftr/docker-group

github-actions · 2023-12-21T21:32:33Z

Diff for 0887b6b:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 92170a9..f8c2937 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,7 +4,7 @@ Builder: buildkit
 
 Tags: 24.0.7-cli, 24.0-cli, 24-cli, cli, 24.0.7-cli-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 18bbfb7d201fc854d6bf9ee589f55290a543f209
+GitCommit: 3a0424834732f20142291cdd1d392e6d860af2ad
 Directory: 24/cli
 
 Tags: 24.0.7-dind, 24.0-dind, 24-dind, dind, 24.0.7-dind-alpine3.19, 24.0.7, 24.0, 24, latest, 24.0.7-alpine3.19
@@ -38,38 +38,38 @@ Directory: 24/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 25.0.0-beta.2-cli, 25-rc-cli, rc-cli, 25.0.0-beta.2-cli-alpine3.19
+Tags: 25.0.0-beta.3-cli, 25-rc-cli, rc-cli, 25.0.0-beta.3-cli-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 18bbfb7d201fc854d6bf9ee589f55290a543f209
+GitCommit: 3a0424834732f20142291cdd1d392e6d860af2ad
 Directory: 25-rc/cli
 
-Tags: 25.0.0-beta.2-dind, 25-rc-dind, rc-dind, 25.0.0-beta.2-dind-alpine3.19, 25.0.0-beta.2, 25-rc, rc, 25.0.0-beta.2-alpine3.19
+Tags: 25.0.0-beta.3-dind, 25-rc-dind, rc-dind, 25.0.0-beta.3-dind-alpine3.19, 25.0.0-beta.3, 25-rc, rc, 25.0.0-beta.3-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 7ac5702b51ae559c03bfe90404f4b8c63977c601
+GitCommit: 8f1087c09b815115f53db74db38c12ae58c2b00b
 Directory: 25-rc/dind
 
-Tags: 25.0.0-beta.2-dind-rootless, 25-rc-dind-rootless, rc-dind-rootless
+Tags: 25.0.0-beta.3-dind-rootless, 25-rc-dind-rootless, rc-dind-rootless
 Architectures: amd64, arm64v8
-GitCommit: d8b20e0d84b8bac8629e782e0fc779d537eab8d8
+GitCommit: 8f1087c09b815115f53db74db38c12ae58c2b00b
 Directory: 25-rc/dind-rootless
 
-Tags: 25.0.0-beta.2-git, 25-rc-git, rc-git
+Tags: 25.0.0-beta.3-git, 25-rc-git, rc-git
 Architectures: amd64, arm32v6, arm32v7, arm64v8
 GitCommit: 2e213030c57a2134a77bf17b0710dff1a184a7c1
 Directory: 25-rc/git
 
-Tags: 25.0.0-beta.2-windowsservercore-1809, 25-rc-windowsservercore-1809, rc-windowsservercore-1809
-SharedTags: 25.0.0-beta.2-windowsservercore, 25-rc-windowsservercore, rc-windowsservercore
+Tags: 25.0.0-beta.3-windowsservercore-1809, 25-rc-windowsservercore-1809, rc-windowsservercore-1809
+SharedTags: 25.0.0-beta.3-windowsservercore, 25-rc-windowsservercore, rc-windowsservercore
 Architectures: windows-amd64
-GitCommit: d8b20e0d84b8bac8629e782e0fc779d537eab8d8
+GitCommit: 8f1087c09b815115f53db74db38c12ae58c2b00b
 Directory: 25-rc/windows/windowsservercore-1809
 Builder: classic
 Constraints: windowsservercore-1809
 
-Tags: 25.0.0-beta.2-windowsservercore-ltsc2022, 25-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
-SharedTags: 25.0.0-beta.2-windowsservercore, 25-rc-windowsservercore, rc-windowsservercore
+Tags: 25.0.0-beta.3-windowsservercore-ltsc2022, 25-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
+SharedTags: 25.0.0-beta.3-windowsservercore, 25-rc-windowsservercore, rc-windowsservercore
 Architectures: windows-amd64
-GitCommit: d8b20e0d84b8bac8629e782e0fc779d537eab8d8
+GitCommit: 8f1087c09b815115f53db74db38c12ae58c2b00b
 Directory: 25-rc/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 8064fe2..ef11915 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -33,17 +33,17 @@ docker:25-rc-git
 docker:25-rc-windowsservercore
 docker:25-rc-windowsservercore-1809
 docker:25-rc-windowsservercore-ltsc2022
-docker:25.0.0-beta.2
-docker:25.0.0-beta.2-alpine3.19
-docker:25.0.0-beta.2-cli
-docker:25.0.0-beta.2-cli-alpine3.19
-docker:25.0.0-beta.2-dind
-docker:25.0.0-beta.2-dind-alpine3.19
-docker:25.0.0-beta.2-dind-rootless
-docker:25.0.0-beta.2-git
-docker:25.0.0-beta.2-windowsservercore
-docker:25.0.0-beta.2-windowsservercore-1809
-docker:25.0.0-beta.2-windowsservercore-ltsc2022
+docker:25.0.0-beta.3
+docker:25.0.0-beta.3-alpine3.19
+docker:25.0.0-beta.3-cli
+docker:25.0.0-beta.3-cli-alpine3.19
+docker:25.0.0-beta.3-dind
+docker:25.0.0-beta.3-dind-alpine3.19
+docker:25.0.0-beta.3-dind-rootless
+docker:25.0.0-beta.3-git
+docker:25.0.0-beta.3-windowsservercore
+docker:25.0.0-beta.3-windowsservercore-1809
+docker:25.0.0-beta.3-windowsservercore-ltsc2022
 docker:cli
 docker:dind
 docker:dind-rootless
diff --git a/docker_25.0.0-beta.2-alpine3.19/Dockerfile b/docker_25.0.0-beta.3-alpine3.19/Dockerfile
similarity index 97%
rename from docker_25.0.0-beta.2-alpine3.19/Dockerfile
rename to docker_25.0.0-beta.3-alpine3.19/Dockerfile
index 72f8279..15c774f 100644
--- a/docker_25.0.0-beta.2-alpine3.19/Dockerfile
+++ b/docker_25.0.0-beta.3-alpine3.19/Dockerfile
@@ -67,16 +67,16 @@ RUN set -eux; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.3.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.3.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.3.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.3.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_25.0.0-beta.2-alpine3.19/dockerd-entrypoint.sh b/docker_25.0.0-beta.3-alpine3.19/dockerd-entrypoint.sh
similarity index 100%
rename from docker_25.0.0-beta.2-alpine3.19/dockerd-entrypoint.sh
rename to docker_25.0.0-beta.3-alpine3.19/dockerd-entrypoint.sh
diff --git a/docker_25.0.0-beta.2-cli-alpine3.19/Dockerfile b/docker_25.0.0-beta.3-cli-alpine3.19/Dockerfile
similarity index 97%
rename from docker_25.0.0-beta.2-cli-alpine3.19/Dockerfile
rename to docker_25.0.0-beta.3-cli-alpine3.19/Dockerfile
index b1ac0aa..3911b99 100644
--- a/docker_25.0.0-beta.2-cli-alpine3.19/Dockerfile
+++ b/docker_25.0.0-beta.3-cli-alpine3.19/Dockerfile
@@ -17,23 +17,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 25.0.0-beta.2
+ENV DOCKER_VERSION 25.0.0-beta.3
 
 RUN set -eux; \
 	\
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/x86_64/docker-25.0.0-beta.3.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/armel/docker-25.0.0-beta.3.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/armhf/docker-25.0.0-beta.3.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/aarch64/docker-25.0.0-beta.3.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_25.0.0-beta.2-cli-alpine3.19/docker-entrypoint.sh b/docker_25.0.0-beta.3-cli-alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from docker_25.0.0-beta.2-cli-alpine3.19/docker-entrypoint.sh
rename to docker_25.0.0-beta.3-cli-alpine3.19/docker-entrypoint.sh
diff --git a/docker_25.0.0-beta.2-cli-alpine3.19/modprobe.sh b/docker_25.0.0-beta.3-cli-alpine3.19/modprobe.sh
similarity index 100%
rename from docker_25.0.0-beta.2-cli-alpine3.19/modprobe.sh
rename to docker_25.0.0-beta.3-cli-alpine3.19/modprobe.sh
diff --git a/docker_rc-dind-rootless/Dockerfile b/docker_rc-dind-rootless/Dockerfile
index 70a87b8..1e8944c 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-25.0.0-beta.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-25.0.0-beta.3.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-beta.2.tgz'; \
+			url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-25.0.0-beta.3.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 4fd5fc8..187b05d 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 25.0.0-beta.2
-ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.2.zip
+ENV DOCKER_VERSION 25.0.0-beta.3
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.3.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 0ab63b4..5cc2486 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 25.0.0-beta.2
-ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.2.zip
+ENV DOCKER_VERSION 25.0.0-beta.3
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-25.0.0-beta.3.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:

docker: @tianon @yosifkit

tianon · 2023-12-21T21:37:07Z

Ok, I've applied docker-library/docker@3a04248 for now so we can get this in. Since you're planning at least one RC before GA in (hopefully) Jan, I'll leave that as-is for now, and will plan to revert that revert after the holiday season.

thaJeztah · 2023-12-21T21:40:24Z

Thank you both!! And Happy Holidays!

github-actions bot added the library/docker label Dec 19, 2023

This comment has been minimized.

Sign in to view

yosifkit marked this pull request as draft December 20, 2023 18:25

docker-library-bot force-pushed the docker branch from 8541b74 to 6489d94 Compare December 21, 2023 18:06

This comment has been minimized.

Sign in to view

yosifkit marked this pull request as ready for review December 21, 2023 19:11

docker-library-bot force-pushed the docker branch from 6489d94 to 0887b6b Compare December 21, 2023 21:31

tianon mentioned this pull request Dec 21, 2023

Add a "docker" group docker-library/docker#462

Merged

tianon merged commit 82ad204 into docker-library:master Dec 21, 2023
11 checks passed

tianon deleted the docker branch December 21, 2023 21:38

tianon mentioned this pull request Dec 21, 2023

Add a "docker" group (take two) docker-library/docker#470

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update docker #15943

Update docker #15943

yosifkit commented Dec 19, 2023 •

edited by tianon

Loading

This comment has been minimized.

This comment has been minimized.

tianon commented Dec 21, 2023

thaJeztah commented Dec 21, 2023

github-actions bot commented Dec 21, 2023

tianon commented Dec 21, 2023

thaJeztah commented Dec 21, 2023

Update docker #15943

Update docker #15943

Conversation

yosifkit commented Dec 19, 2023 • edited by tianon Loading

This comment has been minimized.

This comment has been minimized.

tianon commented Dec 21, 2023

thaJeztah commented Dec 21, 2023

github-actions bot commented Dec 21, 2023

tianon commented Dec 21, 2023

thaJeztah commented Dec 21, 2023

yosifkit commented Dec 19, 2023 •

edited by tianon

Loading