Update docker - #21975
Merged
Merged
Conversation
Changes: - docker-library/docker@0906c95: Update 29 to compose 5.4.0 - docker-library/docker@bbeb926: Update 29 to 29.7.1
Diff for 217316d:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 0609a63..b102803 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,33 +2,33 @@ Maintainers: Tianon Gravi <tianon@dockerproject.org> (@tianon), Joseph Ferguson
GitRepo: https://github.com/docker-library/docker.git
Builder: buildkit
-Tags: 29.7.0-cli, 29.7-cli, 29-cli, cli, 29.7.0-cli-alpine3.24
+Tags: 29.7.1-cli, 29.7-cli, 29-cli, cli, 29.7.1-cli-alpine3.24
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 1be6a77ca8e37a1668250ed412caa56eab811c6d
+GitCommit: 0906c956e96cf64d40b9a8c7a14e5b407602c853
Directory: 29/cli
-Tags: 29.7.0-dind, 29.7-dind, 29-dind, dind, 29.7.0-dind-alpine3.24, 29.7.0, 29.7, 29, latest, 29.7.0-alpine3.24
+Tags: 29.7.1-dind, 29.7-dind, 29-dind, dind, 29.7.1-dind-alpine3.24, 29.7.1, 29.7, 29, latest, 29.7.1-alpine3.24
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 1be6a77ca8e37a1668250ed412caa56eab811c6d
+GitCommit: bbeb9261dde64bc735b6edeb4766f8d3d611977d
Directory: 29/dind
-Tags: 29.7.0-dind-rootless, 29.7-dind-rootless, 29-dind-rootless, dind-rootless
+Tags: 29.7.1-dind-rootless, 29.7-dind-rootless, 29-dind-rootless, dind-rootless
Architectures: amd64, arm64v8
-GitCommit: 1be6a77ca8e37a1668250ed412caa56eab811c6d
+GitCommit: bbeb9261dde64bc735b6edeb4766f8d3d611977d
Directory: 29/dind-rootless
-Tags: 29.7.0-windowsservercore-ltsc2022, 29.7-windowsservercore-ltsc2022, 29-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 29.7.0-windowsservercore, 29.7-windowsservercore, 29-windowsservercore, windowsservercore
+Tags: 29.7.1-windowsservercore-ltsc2022, 29.7-windowsservercore-ltsc2022, 29-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 29.7.1-windowsservercore, 29.7-windowsservercore, 29-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 6e14e9f3f8ce8717f5fd075c546903edcbd30d75
+GitCommit: 0906c956e96cf64d40b9a8c7a14e5b407602c853
Directory: 29/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
-Tags: 29.7.0-windowsservercore-ltsc2025, 29.7-windowsservercore-ltsc2025, 29-windowsservercore-ltsc2025, windowsservercore-ltsc2025
-SharedTags: 29.7.0-windowsservercore, 29.7-windowsservercore, 29-windowsservercore, windowsservercore
+Tags: 29.7.1-windowsservercore-ltsc2025, 29.7-windowsservercore-ltsc2025, 29-windowsservercore-ltsc2025, windowsservercore-ltsc2025
+SharedTags: 29.7.1-windowsservercore, 29.7-windowsservercore, 29-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 6e14e9f3f8ce8717f5fd075c546903edcbd30d75
+GitCommit: 0906c956e96cf64d40b9a8c7a14e5b407602c853
Directory: 29/windows/windowsservercore-ltsc2025
Builder: classic
Constraints: windowsservercore-ltsc2025
diff --git a/_bashbrew-list b/_bashbrew-list
index 8bb988e..ec4a26b 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -12,16 +12,16 @@ docker:29.7-dind-rootless
docker:29.7-windowsservercore
docker:29.7-windowsservercore-ltsc2022
docker:29.7-windowsservercore-ltsc2025
-docker:29.7.0
-docker:29.7.0-alpine3.24
-docker:29.7.0-cli
-docker:29.7.0-cli-alpine3.24
-docker:29.7.0-dind
-docker:29.7.0-dind-alpine3.24
-docker:29.7.0-dind-rootless
-docker:29.7.0-windowsservercore
-docker:29.7.0-windowsservercore-ltsc2022
-docker:29.7.0-windowsservercore-ltsc2025
+docker:29.7.1
+docker:29.7.1-alpine3.24
+docker:29.7.1-cli
+docker:29.7.1-cli-alpine3.24
+docker:29.7.1-dind
+docker:29.7.1-dind-alpine3.24
+docker:29.7.1-dind-rootless
+docker:29.7.1-windowsservercore
+docker:29.7.1-windowsservercore-ltsc2022
+docker:29.7.1-windowsservercore-ltsc2025
docker:cli
docker:dind
docker:dind-rootless
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 38b9a99..77bb3a5 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,5 +1,5 @@
-docker:29.7.0-cli-alpine3.24
+docker:29.7.1-cli-alpine3.24
docker:windowsservercore-ltsc2022
docker:windowsservercore-ltsc2025
-docker:29.7.0-alpine3.24
+docker:29.7.1-alpine3.24
docker:dind-rootless
diff --git a/docker_29.7.0-alpine3.24/Dockerfile b/docker_29.7.1-alpine3.24/Dockerfile
similarity index 97%
rename from docker_29.7.0-alpine3.24/Dockerfile
rename to docker_29.7.1-alpine3.24/Dockerfile
index 9270928..b3699ad 100644
--- a/docker_29.7.0-alpine3.24/Dockerfile
+++ b/docker_29.7.1-alpine3.24/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-29.7.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-29.7.1.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-29.7.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-29.7.1.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-29.7.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-29.7.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-29.7.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-29.7.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_29.7.0-alpine3.24/dockerd-entrypoint.sh b/docker_29.7.1-alpine3.24/dockerd-entrypoint.sh
similarity index 100%
rename from docker_29.7.0-alpine3.24/dockerd-entrypoint.sh
rename to docker_29.7.1-alpine3.24/dockerd-entrypoint.sh
diff --git a/docker_29.7.0-cli-alpine3.24/Dockerfile b/docker_29.7.1-cli-alpine3.24/Dockerfile
similarity index 78%
rename from docker_29.7.0-cli-alpine3.24/Dockerfile
rename to docker_29.7.1-cli-alpine3.24/Dockerfile
index 6d8c194..6702c63 100644
--- a/docker_29.7.0-cli-alpine3.24/Dockerfile
+++ b/docker_29.7.1-cli-alpine3.24/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 29.7.0
+ENV DOCKER_VERSION 29.7.1
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/stable/x86_64/docker-29.7.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-29.7.1.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-29.7.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-29.7.1.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-29.7.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-29.7.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-29.7.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-29.7.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
@@ -103,38 +103,38 @@ RUN set -eux; \
\
docker buildx version
-ENV DOCKER_COMPOSE_VERSION 5.3.1
+ENV DOCKER_COMPOSE_VERSION 5.4.0
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-x86_64'; \
- sha256='f9ebc6ebdb19d769b793c245a736caaeb198c62587f13b25c660c13b4987f959'; \
+ url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-x86_64'; \
+ sha256='837fd1d35bf6a494f41b5b5988269a7be79de337cf1a1a6ff0e45ab51bb4e9be'; \
;; \
'armhf') \
- url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv6'; \
- sha256='899607529e5e752cbdaec84b73e994378cf8f27f3d626a5a6df56f7511c00304'; \
+ url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-armv6'; \
+ sha256='a5832fe8544e6e72af7cc380a2e3c014a6ced6d56db12fe814d40ffd0e657a6d'; \
;; \
'armv7') \
- url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-armv7'; \
- sha256='69276acb37ea70023cf85a8180e869c0cfc8cb5a3e672821400aa58dea56e2e8'; \
+ url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-armv7'; \
+ sha256='f0c92550db24083a2622e4e980a3fdc13890125962ca09590a86c87ad0b3c536'; \
;; \
'aarch64') \
- url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-aarch64'; \
- sha256='aa611e811d0ea25897839c404bfb5bf93ce706dc51c500a4457890f5d0606a86'; \
+ url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-aarch64'; \
+ sha256='fc5d1371f1ec7987e703da94ede49af3fbfb240b83f22991a98511de7bc4b93b'; \
;; \
'ppc64le') \
- url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-ppc64le'; \
- sha256='3280a0dcc7874c2a564ca1224c5669364bc1a5d83ae7153a9c0182fd76fd2102'; \
+ url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-ppc64le'; \
+ sha256='8158968c7ddb298ae901024c5fb6d471454d1bd75bdea317c4a9d24f87fa4868'; \
;; \
'riscv64') \
- url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-riscv64'; \
- sha256='e237f165e0fd5472d147db274f0fb5dcdaab4384c36634178307f4c8e965d904'; \
+ url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-riscv64'; \
+ sha256='016b7ac25ce605575bab99464d6b63141c41e14cc49cd0fa19c82aa8dd75a004'; \
;; \
's390x') \
- url='https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-linux-s390x'; \
- sha256='3889c8d1677bee347297c8f0a73bc517b5c35da18781812942aef8a87eac9011'; \
+ url='https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-linux-s390x'; \
+ sha256='892b60ad432d526b80376ba0b15429c6849ccc598b50b657aa6339310110a85a'; \
;; \
*) echo >&2 "warning: unsupported 'docker-compose' architecture ($apkArch); skipping"; exit 0 ;; \
esac; \
diff --git a/docker_29.7.0-cli-alpine3.24/docker-entrypoint.sh b/docker_29.7.1-cli-alpine3.24/docker-entrypoint.sh
similarity index 100%
rename from docker_29.7.0-cli-alpine3.24/docker-entrypoint.sh
rename to docker_29.7.1-cli-alpine3.24/docker-entrypoint.sh
diff --git a/docker_29.7.0-cli-alpine3.24/modprobe.sh b/docker_29.7.1-cli-alpine3.24/modprobe.sh
similarity index 100%
rename from docker_29.7.0-cli-alpine3.24/modprobe.sh
rename to docker_29.7.1-cli-alpine3.24/modprobe.sh
diff --git a/docker_dind-rootless/Dockerfile b/docker_dind-rootless/Dockerfile
index 8d5305a..57eb966 100644
--- a/docker_dind-rootless/Dockerfile
+++ b/docker_dind-rootless/Dockerfile
@@ -26,10 +26,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-29.7.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-29.7.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.7.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-29.7.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_windowsservercore-ltsc2022/Dockerfile b/docker_windowsservercore-ltsc2022/Dockerfile
index 98b236a..3569059 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 29.7.0
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.7.0.zip
+ENV DOCKER_VERSION 29.7.1
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.7.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)
@@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
docker buildx version; \
\
Write-Host 'Complete.';
-ENV DOCKER_COMPOSE_VERSION 5.3.1
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 6d36cc701393c066d67ebc77773b718d8c738bc4ccb350fbf1dc0e6a09f44cb9
+ENV DOCKER_COMPOSE_VERSION 5.4.0
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 d51bc731b3ff6f062a26e8fdfd391ae98aeab516432f097c66d39c1c9d06680e
RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
Write-Host ('Creating {0} ...' -f $dir); \
New-Item -ItemType Directory $dir -Force; \
diff --git a/docker_windowsservercore-ltsc2025/Dockerfile b/docker_windowsservercore-ltsc2025/Dockerfile
index 9e18920..838f48a 100644
--- a/docker_windowsservercore-ltsc2025/Dockerfile
+++ b/docker_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 29.7.0
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.7.0.zip
+ENV DOCKER_VERSION 29.7.1
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-29.7.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)
@@ -61,9 +61,9 @@ RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
docker buildx version; \
\
Write-Host 'Complete.';
-ENV DOCKER_COMPOSE_VERSION 5.3.1
-ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.3.1/docker-compose-windows-x86_64.exe
-ENV DOCKER_COMPOSE_SHA256 6d36cc701393c066d67ebc77773b718d8c738bc4ccb350fbf1dc0e6a09f44cb9
+ENV DOCKER_COMPOSE_VERSION 5.4.0
+ENV DOCKER_COMPOSE_URL https://github.com/docker/compose/releases/download/v5.4.0/docker-compose-windows-x86_64.exe
+ENV DOCKER_COMPOSE_SHA256 d51bc731b3ff6f062a26e8fdfd391ae98aeab516432f097c66d39c1c9d06680e
RUN $dir = ('{0}\docker\cli-plugins' -f $env:ProgramFiles); \
Write-Host ('Creating {0} ...' -f $dir); \
New-Item -ItemType Directory $dir -Force; \Relevant Maintainers: |
This file contains hidden or 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
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: