Update docker #18283
Merged
Update docker #18283
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
This comment has been minimized.
This comment has been minimized.
Changes: - docker-library/docker@03ecb33: Update 27 to 27.5.1 - docker-library/docker@cfd500f: Merge pull request docker-library/docker#523 from infosiftr/ltsc2025 - docker-library/docker@913a998: Add Windows Server 2025 variant
docker-library-bot
force-pushed
the
docker
branch
from
000955e to
644c233
Compare
Diff for 644c233:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 05b47b8..fa973dc 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,33 +2,41 @@ Maintainers: Tianon Gravi <tianon@dockerproject.org> (@tianon), Joseph Ferguson
GitRepo: https://github.com/docker-library/docker.git
Builder: buildkit
-Tags: 27.5.0-cli, 27.5-cli, 27-cli, cli, 27.5.0-cli-alpine3.21
+Tags: 27.5.1-cli, 27.5-cli, 27-cli, cli, 27.5.1-cli-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 4c7a6d18d9aea3620ee177b855e762f6407fd551
+GitCommit: 03ecb33955c16b34b7d52c7563f05c736f159875
Directory: 27/cli
-Tags: 27.5.0-dind, 27.5-dind, 27-dind, dind, 27.5.0-dind-alpine3.21, 27.5.0, 27.5, 27, latest, 27.5.0-alpine3.21
+Tags: 27.5.1-dind, 27.5-dind, 27-dind, dind, 27.5.1-dind-alpine3.21, 27.5.1, 27.5, 27, latest, 27.5.1-alpine3.21
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 49e7a0aa907a6033c2482efbf8e25bb97588b184
+GitCommit: 03ecb33955c16b34b7d52c7563f05c736f159875
Directory: 27/dind
-Tags: 27.5.0-dind-rootless, 27.5-dind-rootless, 27-dind-rootless, dind-rootless
+Tags: 27.5.1-dind-rootless, 27.5-dind-rootless, 27-dind-rootless, dind-rootless
Architectures: amd64, arm64v8
-GitCommit: 49e7a0aa907a6033c2482efbf8e25bb97588b184
+GitCommit: 03ecb33955c16b34b7d52c7563f05c736f159875
Directory: 27/dind-rootless
-Tags: 27.5.0-windowsservercore-1809, 27.5-windowsservercore-1809, 27-windowsservercore-1809, windowsservercore-1809
-SharedTags: 27.5.0-windowsservercore, 27.5-windowsservercore, 27-windowsservercore, windowsservercore
+Tags: 27.5.1-windowsservercore-1809, 27.5-windowsservercore-1809, 27-windowsservercore-1809, windowsservercore-1809
+SharedTags: 27.5.1-windowsservercore, 27.5-windowsservercore, 27-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 4c7a6d18d9aea3620ee177b855e762f6407fd551
+GitCommit: 03ecb33955c16b34b7d52c7563f05c736f159875
Directory: 27/windows/windowsservercore-1809
Builder: classic
Constraints: windowsservercore-1809
-Tags: 27.5.0-windowsservercore-ltsc2022, 27.5-windowsservercore-ltsc2022, 27-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 27.5.0-windowsservercore, 27.5-windowsservercore, 27-windowsservercore, windowsservercore
+Tags: 27.5.1-windowsservercore-ltsc2022, 27.5-windowsservercore-ltsc2022, 27-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 27.5.1-windowsservercore, 27.5-windowsservercore, 27-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 4c7a6d18d9aea3620ee177b855e762f6407fd551
+GitCommit: 03ecb33955c16b34b7d52c7563f05c736f159875
Directory: 27/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
+
+Tags: 27.5.1-windowsservercore-ltsc2025, 27.5-windowsservercore-ltsc2025, 27-windowsservercore-ltsc2025, windowsservercore-ltsc2025
+SharedTags: 27.5.1-windowsservercore, 27.5-windowsservercore, 27-windowsservercore, windowsservercore
+Architectures: windows-amd64
+GitCommit: 03ecb33955c16b34b7d52c7563f05c736f159875
+Directory: 27/windows/windowsservercore-ltsc2025
+Builder: classic
+Constraints: windowsservercore-ltsc2025
diff --git a/_bashbrew-list b/_bashbrew-list
index b9c8163..5a8473d 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -5,6 +5,7 @@ docker:27-dind-rootless
docker:27-windowsservercore
docker:27-windowsservercore-1809
docker:27-windowsservercore-ltsc2022
+docker:27-windowsservercore-ltsc2025
docker:27.5
docker:27.5-cli
docker:27.5-dind
@@ -12,16 +13,18 @@ docker:27.5-dind-rootless
docker:27.5-windowsservercore
docker:27.5-windowsservercore-1809
docker:27.5-windowsservercore-ltsc2022
-docker:27.5.0
-docker:27.5.0-alpine3.21
-docker:27.5.0-cli
-docker:27.5.0-cli-alpine3.21
-docker:27.5.0-dind
-docker:27.5.0-dind-alpine3.21
-docker:27.5.0-dind-rootless
-docker:27.5.0-windowsservercore
-docker:27.5.0-windowsservercore-1809
-docker:27.5.0-windowsservercore-ltsc2022
+docker:27.5-windowsservercore-ltsc2025
+docker:27.5.1
+docker:27.5.1-alpine3.21
+docker:27.5.1-cli
+docker:27.5.1-cli-alpine3.21
+docker:27.5.1-dind
+docker:27.5.1-dind-alpine3.21
+docker:27.5.1-dind-rootless
+docker:27.5.1-windowsservercore
+docker:27.5.1-windowsservercore-1809
+docker:27.5.1-windowsservercore-ltsc2022
+docker:27.5.1-windowsservercore-ltsc2025
docker:cli
docker:dind
docker:dind-rootless
@@ -29,3 +32,4 @@ docker:latest
docker:windowsservercore
docker:windowsservercore-1809
docker:windowsservercore-ltsc2022
+docker:windowsservercore-ltsc2025
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index acfd106..c005074 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,5 +1,6 @@
-docker:27.5.0-cli-alpine3.21
+docker:27.5.1-cli-alpine3.21
docker:windowsservercore-1809
docker:windowsservercore-ltsc2022
-docker:27.5.0-alpine3.21
+docker:windowsservercore-ltsc2025
+docker:27.5.1-alpine3.21
docker:dind-rootless
diff --git a/docker_27.5.0-alpine3.21/Dockerfile b/docker_27.5.1-alpine3.21/Dockerfile
similarity index 97%
rename from docker_27.5.0-alpine3.21/Dockerfile
rename to docker_27.5.1-alpine3.21/Dockerfile
index cc36228..67fe5fe 100644
--- a/docker_27.5.0-alpine3.21/Dockerfile
+++ b/docker_27.5.1-alpine3.21/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.5.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-27.5.1.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-27.5.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-27.5.1.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-27.5.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-27.5.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-27.5.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-27.5.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_27.5.0-alpine3.21/dockerd-entrypoint.sh b/docker_27.5.1-alpine3.21/dockerd-entrypoint.sh
similarity index 100%
rename from docker_27.5.0-alpine3.21/dockerd-entrypoint.sh
rename to docker_27.5.1-alpine3.21/dockerd-entrypoint.sh
diff --git a/docker_27.5.0-cli-alpine3.21/Dockerfile b/docker_27.5.1-cli-alpine3.21/Dockerfile
similarity index 98%
rename from docker_27.5.0-cli-alpine3.21/Dockerfile
rename to docker_27.5.1-cli-alpine3.21/Dockerfile
index 43d8e7e..eebc823 100644
--- a/docker_27.5.0-cli-alpine3.21/Dockerfile
+++ b/docker_27.5.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.0
+ENV DOCKER_VERSION 27.5.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.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-27.5.1.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-27.5.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-27.5.1.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-27.5.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-27.5.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-27.5.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-27.5.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_27.5.0-cli-alpine3.21/docker-entrypoint.sh b/docker_27.5.1-cli-alpine3.21/docker-entrypoint.sh
similarity index 100%
rename from docker_27.5.0-cli-alpine3.21/docker-entrypoint.sh
rename to docker_27.5.1-cli-alpine3.21/docker-entrypoint.sh
diff --git a/docker_27.5.0-cli-alpine3.21/modprobe.sh b/docker_27.5.1-cli-alpine3.21/modprobe.sh
similarity index 100%
rename from docker_27.5.0-cli-alpine3.21/modprobe.sh
rename to docker_27.5.1-cli-alpine3.21/modprobe.sh
diff --git a/docker_dind-rootless/Dockerfile b/docker_dind-rootless/Dockerfile
index 30039d1..73bbb50 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.5.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-27.5.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.5.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-27.5.1.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 b26d112..979ab41 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.5.0
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.0.zip
+ENV DOCKER_VERSION 27.5.1
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.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_windowsservercore-ltsc2022/Dockerfile
index f12dca6..aeba13a 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.5.0
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.0.zip
+ENV DOCKER_VERSION 27.5.1
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.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_windowsservercore-ltsc2025/Dockerfile
similarity index 97%
copy from docker_windowsservercore-ltsc2022/Dockerfile
copy to docker_windowsservercore-ltsc2025/Dockerfile
index f12dca6..9a19caf 100644
--- a/docker_windowsservercore-ltsc2022/Dockerfile
+++ b/docker_windowsservercore-ltsc2025/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM mcr.microsoft.com/windows/servercore:ltsc2022
+FROM mcr.microsoft.com/windows/servercore:ltsc2025
# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
@@ -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.0
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.0.zip
+ENV DOCKER_VERSION 27.5.1
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-27.5.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
Jan 22, 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: