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.

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

Update docker #17228

Merged
merged 1 commit into from
Jul 22, 2024
Merged

Update docker #17228

merged 1 commit into from
Jul 22, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Jul 22, 2024

Changes:

Changes:

- docker-library/docker@fc40408: Update 27 to 27.1.0
@tianon tianon requested a review from a team as a code owner July 22, 2024 20:43
Copy link

Diff for e101334:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9068ad7..8d37ead 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -95,33 +95,33 @@ Directory: 26/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
 
-Tags: 27.0.3-cli, 27.0-cli, 27-cli, cli, 27.0.3-cli-alpine3.20
+Tags: 27.1.0-cli, 27.1-cli, 27-cli, cli, 27.1.0-cli-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 694a68ce537163d0d6054e51fe64d8c7b350c9db
+GitCommit: fc40408b3cda03b569d976adcf8ac4654be1c542
 Directory: 27/cli
 
-Tags: 27.0.3-dind, 27.0-dind, 27-dind, dind, 27.0.3-dind-alpine3.20, 27.0.3, 27.0, 27, latest, 27.0.3-alpine3.20
+Tags: 27.1.0-dind, 27.1-dind, 27-dind, dind, 27.1.0-dind-alpine3.20, 27.1.0, 27.1, 27, latest, 27.1.0-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 75c73110b6ee739dab28c30b757eec51484968c1
+GitCommit: fc40408b3cda03b569d976adcf8ac4654be1c542
 Directory: 27/dind
 
-Tags: 27.0.3-dind-rootless, 27.0-dind-rootless, 27-dind-rootless, dind-rootless
+Tags: 27.1.0-dind-rootless, 27.1-dind-rootless, 27-dind-rootless, dind-rootless
 Architectures: amd64, arm64v8
-GitCommit: 75c73110b6ee739dab28c30b757eec51484968c1
+GitCommit: fc40408b3cda03b569d976adcf8ac4654be1c542
 Directory: 27/dind-rootless
 
-Tags: 27.0.3-windowsservercore-1809, 27.0-windowsservercore-1809, 27-windowsservercore-1809, windowsservercore-1809
-SharedTags: 27.0.3-windowsservercore, 27.0-windowsservercore, 27-windowsservercore, windowsservercore
+Tags: 27.1.0-windowsservercore-1809, 27.1-windowsservercore-1809, 27-windowsservercore-1809, windowsservercore-1809
+SharedTags: 27.1.0-windowsservercore, 27.1-windowsservercore, 27-windowsservercore, windowsservercore
 Architectures: windows-amd64
-GitCommit: 694a68ce537163d0d6054e51fe64d8c7b350c9db
+GitCommit: fc40408b3cda03b569d976adcf8ac4654be1c542
 Directory: 27/windows/windowsservercore-1809
 Builder: classic
 Constraints: windowsservercore-1809
 
-Tags: 27.0.3-windowsservercore-ltsc2022, 27.0-windowsservercore-ltsc2022, 27-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 27.0.3-windowsservercore, 27.0-windowsservercore, 27-windowsservercore, windowsservercore
+Tags: 27.1.0-windowsservercore-ltsc2022, 27.1-windowsservercore-ltsc2022, 27-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 27.1.0-windowsservercore, 27.1-windowsservercore, 27-windowsservercore, windowsservercore
 Architectures: windows-amd64
-GitCommit: 694a68ce537163d0d6054e51fe64d8c7b350c9db
+GitCommit: fc40408b3cda03b569d976adcf8ac4654be1c542
 Directory: 27/windows/windowsservercore-ltsc2022
 Builder: classic
 Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 03da6a5..d1bf6f7 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -83,23 +83,23 @@ docker:27-dind-rootless
 docker:27-windowsservercore
 docker:27-windowsservercore-1809
 docker:27-windowsservercore-ltsc2022
-docker:27.0
-docker:27.0-cli
-docker:27.0-dind
-docker:27.0-dind-rootless
-docker:27.0-windowsservercore
-docker:27.0-windowsservercore-1809
-docker:27.0-windowsservercore-ltsc2022
-docker:27.0.3
-docker:27.0.3-alpine3.20
-docker:27.0.3-cli
-docker:27.0.3-cli-alpine3.20
-docker:27.0.3-dind
-docker:27.0.3-dind-alpine3.20
-docker:27.0.3-dind-rootless
-docker:27.0.3-windowsservercore
-docker:27.0.3-windowsservercore-1809
-docker:27.0.3-windowsservercore-ltsc2022
+docker:27.1
+docker:27.1-cli
+docker:27.1-dind
+docker:27.1-dind-rootless
+docker:27.1-windowsservercore
+docker:27.1-windowsservercore-1809
+docker:27.1-windowsservercore-ltsc2022
+docker:27.1.0
+docker:27.1.0-alpine3.20
+docker:27.1.0-cli
+docker:27.1.0-cli-alpine3.20
+docker:27.1.0-dind
+docker:27.1.0-dind-alpine3.20
+docker:27.1.0-dind-rootless
+docker:27.1.0-windowsservercore
+docker:27.1.0-windowsservercore-1809
+docker:27.1.0-windowsservercore-ltsc2022
 docker:cli
 docker:dind
 docker:dind-rootless
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 160bc7f..e12ac13 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -7,13 +7,13 @@ docker:25.0.5-cli-alpine3.20
 docker:26-windowsservercore-1809
 docker:26-windowsservercore-ltsc2022
 docker:26.1.4-cli-alpine3.20
-docker:27.0.3-cli-alpine3.20
+docker:27.1.0-cli-alpine3.20
 docker:windowsservercore-1809
 docker:windowsservercore-ltsc2022
 docker:24.0.9-alpine3.20
 docker:25.0.5-alpine3.20
 docker:26.1.4-alpine3.20
-docker:27.0.3-alpine3.20
+docker:27.1.0-alpine3.20
 docker:dind-rootless
 docker:24-dind-rootless
 docker:25-dind-rootless
diff --git a/docker_27.0.3-alpine3.20/Dockerfile b/docker_27.1.0-alpine3.20/Dockerfile
similarity index 97%
rename from docker_27.0.3-alpine3.20/Dockerfile
rename to docker_27.1.0-alpine3.20/Dockerfile
index 1ac2604..bfea6fe 100644
--- a/docker_27.0.3-alpine3.20/Dockerfile
+++ b/docker_27.1.0-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/stable/x86_64/docker-27.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/x86_64/docker-27.1.0.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/stable/armel/docker-27.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/armel/docker-27.1.0.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/stable/armhf/docker-27.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/armhf/docker-27.1.0.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/stable/aarch64/docker-27.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/aarch64/docker-27.1.0.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_27.0.3-alpine3.20/dockerd-entrypoint.sh b/docker_27.1.0-alpine3.20/dockerd-entrypoint.sh
similarity index 100%
rename from docker_27.0.3-alpine3.20/dockerd-entrypoint.sh
rename to docker_27.1.0-alpine3.20/dockerd-entrypoint.sh
diff --git a/docker_27.0.3-cli-alpine3.20/Dockerfile b/docker_27.1.0-cli-alpine3.20/Dockerfile
similarity index 98%
rename from docker_27.0.3-cli-alpine3.20/Dockerfile
rename to docker_27.1.0-cli-alpine3.20/Dockerfile
index 7dba2ff..805c39b 100644
--- a/docker_27.0.3-cli-alpine3.20/Dockerfile
+++ b/docker_27.1.0-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.0.3
+ENV DOCKER_VERSION 27.1.0
 
 RUN set -eux; \
 	\
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
 		'x86_64') \
-			url='https://download.docker.com/linux/static/stable/x86_64/docker-27.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/x86_64/docker-27.1.0.tgz'; \
 			;; \
 		'armhf') \
-			url='https://download.docker.com/linux/static/stable/armel/docker-27.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/armel/docker-27.1.0.tgz'; \
 			;; \
 		'armv7') \
-			url='https://download.docker.com/linux/static/stable/armhf/docker-27.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/armhf/docker-27.1.0.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/stable/aarch64/docker-27.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/aarch64/docker-27.1.0.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_27.0.3-cli-alpine3.20/docker-entrypoint.sh b/docker_27.1.0-cli-alpine3.20/docker-entrypoint.sh
similarity index 100%
rename from docker_27.0.3-cli-alpine3.20/docker-entrypoint.sh
rename to docker_27.1.0-cli-alpine3.20/docker-entrypoint.sh
diff --git a/docker_27.0.3-cli-alpine3.20/modprobe.sh b/docker_27.1.0-cli-alpine3.20/modprobe.sh
similarity index 100%
rename from docker_27.0.3-cli-alpine3.20/modprobe.sh
rename to docker_27.1.0-cli-alpine3.20/modprobe.sh
diff --git a/docker_dind-rootless/Dockerfile b/docker_dind-rootless/Dockerfile
index eb1d5dd..51988f7 100644
--- a/docker_dind-rootless/Dockerfile
+++ b/docker_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/stable/x86_64/docker-rootless-extras-27.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.1.0.tgz'; \
 			;; \
 		'aarch64') \
-			url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.0.3.tgz'; \
+			url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.1.0.tgz'; \
 			;; \
 		*) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \
 	esac; \
diff --git a/docker_windowsservercore-1809/Dockerfile b/docker_windowsservercore-1809/Dockerfile
index a43fb80..a37f455 100644
--- a/docker_windowsservercore-1809/Dockerfile
+++ b/docker_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.0.3
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.0.3.zip
+ENV DOCKER_VERSION 27.1.0
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.1.0.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_windowsservercore-ltsc2022/Dockerfile
index 500a494..52c3088 100644
--- a/docker_windowsservercore-ltsc2022/Dockerfile
+++ b/docker_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.0.3
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.0.3.zip
+ENV DOCKER_VERSION 27.1.0
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.1.0.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 yosifkit merged commit db30620 into docker-library:master Jul 22, 2024
17 checks passed
@yosifkit yosifkit deleted the docker branch July 22, 2024 21:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants