Update docker #16589
Merged
Update docker #16589
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
Changes: - docker-library/docker@b1589f6: Update 26 to 26.0.1 - docker-library/docker@1b4d76a: Merge pull request docker-library/docker#488 from infosiftr/defensive-curl - docker-library/docker@8114f46: Update "versions" curl invocation to be more defensive - docker-library/docker@9329f88: Update 26 to compose 2.26.1 - docker-library/docker@9b7730d: Update 26 to compose 2.26.0
Diff for 9659741:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6178753..d06e2d1 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -64,33 +64,33 @@ Directory: 25/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
-Tags: 26.0.0-cli, 26.0-cli, 26-cli, cli, 26.0.0-cli-alpine3.19
+Tags: 26.0.1-cli, 26.0-cli, 26-cli, cli, 26.0.1-cli-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 1d101cc2a35b846215c3784deec80ab98f2847b5
+GitCommit: b1589f6cf9a16dc36739c9569d60aad554966116
Directory: 26/cli
-Tags: 26.0.0-dind, 26.0-dind, 26-dind, dind, 26.0.0-dind-alpine3.19, 26.0.0, 26.0, 26, latest, 26.0.0-alpine3.19
+Tags: 26.0.1-dind, 26.0-dind, 26-dind, dind, 26.0.1-dind-alpine3.19, 26.0.1, 26.0, 26, latest, 26.0.1-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 79c28eb1b838542a8e6732b66d00839d426bd589
+GitCommit: b1589f6cf9a16dc36739c9569d60aad554966116
Directory: 26/dind
-Tags: 26.0.0-dind-rootless, 26.0-dind-rootless, 26-dind-rootless, dind-rootless
+Tags: 26.0.1-dind-rootless, 26.0-dind-rootless, 26-dind-rootless, dind-rootless
Architectures: amd64, arm64v8
-GitCommit: 79c28eb1b838542a8e6732b66d00839d426bd589
+GitCommit: b1589f6cf9a16dc36739c9569d60aad554966116
Directory: 26/dind-rootless
-Tags: 26.0.0-windowsservercore-1809, 26.0-windowsservercore-1809, 26-windowsservercore-1809, windowsservercore-1809
-SharedTags: 26.0.0-windowsservercore, 26.0-windowsservercore, 26-windowsservercore, windowsservercore
+Tags: 26.0.1-windowsservercore-1809, 26.0-windowsservercore-1809, 26-windowsservercore-1809, windowsservercore-1809
+SharedTags: 26.0.1-windowsservercore, 26.0-windowsservercore, 26-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 1d101cc2a35b846215c3784deec80ab98f2847b5
+GitCommit: b1589f6cf9a16dc36739c9569d60aad554966116
Directory: 26/windows/windowsservercore-1809
Builder: classic
Constraints: windowsservercore-1809
-Tags: 26.0.0-windowsservercore-ltsc2022, 26.0-windowsservercore-ltsc2022, 26-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 26.0.0-windowsservercore, 26.0-windowsservercore, 26-windowsservercore, windowsservercore
+Tags: 26.0.1-windowsservercore-ltsc2022, 26.0-windowsservercore-ltsc2022, 26-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 26.0.1-windowsservercore, 26.0-windowsservercore, 26-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: 1d101cc2a35b846215c3784deec80ab98f2847b5
+GitCommit: b1589f6cf9a16dc36739c9569d60aad554966116
Directory: 26/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 5258a0c..9260561 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -66,16 +66,16 @@ docker:26.0-dind-rootless
docker:26.0-windowsservercore
docker:26.0-windowsservercore-1809
docker:26.0-windowsservercore-ltsc2022
-docker:26.0.0
-docker:26.0.0-alpine3.19
-docker:26.0.0-cli
-docker:26.0.0-cli-alpine3.19
-docker:26.0.0-dind
-docker:26.0.0-dind-alpine3.19
-docker:26.0.0-dind-rootless
-docker:26.0.0-windowsservercore
-docker:26.0.0-windowsservercore-1809
-docker:26.0.0-windowsservercore-ltsc2022
+docker:26.0.1
+docker:26.0.1-alpine3.19
+docker:26.0.1-cli
+docker:26.0.1-cli-alpine3.19
+docker:26.0.1-dind
+docker:26.0.1-dind-alpine3.19
+docker:26.0.1-dind-rootless
+docker:26.0.1-windowsservercore
+docker:26.0.1-windowsservercore-1809
+docker:26.0.1-windowsservercore-ltsc2022
docker:cli
docker:dind
docker:dind-rootless
diff --git a/docker_26.0.0-alpine3.19/Dockerfile b/docker_26.0.1-alpine3.19/Dockerfile
similarity index 97%
rename from docker_26.0.0-alpine3.19/Dockerfile
rename to docker_26.0.1-alpine3.19/Dockerfile
index 8fc5142..3ccf48f 100644
--- a/docker_26.0.0-alpine3.19/Dockerfile
+++ b/docker_26.0.1-alpine3.19/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-26.0.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-26.0.1.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-26.0.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-26.0.1.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_26.0.0-alpine3.19/dockerd-entrypoint.sh b/docker_26.0.1-alpine3.19/dockerd-entrypoint.sh
similarity index 100%
rename from docker_26.0.0-alpine3.19/dockerd-entrypoint.sh
rename to docker_26.0.1-alpine3.19/dockerd-entrypoint.sh
diff --git a/docker_26.0.0-cli-alpine3.19/Dockerfile b/docker_26.0.1-cli-alpine3.19/Dockerfile
similarity index 98%
rename from docker_26.0.0-cli-alpine3.19/Dockerfile
rename to docker_26.0.1-cli-alpine3.19/Dockerfile
index d20a131..c0f76c0 100644
--- a/docker_26.0.0-cli-alpine3.19/Dockerfile
+++ b/docker_26.0.1-cli-alpine3.19/Dockerfile
@@ -21,23 +21,23 @@ RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf
RUN set -eux; \
addgroup -g 2375 -S docker
-ENV DOCKER_VERSION 26.0.0
+ENV DOCKER_VERSION 26.0.1
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/stable/x86_64/docker-26.0.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-26.0.1.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-26.0.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-26.0.1.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_26.0.0-cli-alpine3.19/docker-entrypoint.sh b/docker_26.0.1-cli-alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from docker_26.0.0-cli-alpine3.19/docker-entrypoint.sh
rename to docker_26.0.1-cli-alpine3.19/docker-entrypoint.sh
diff --git a/docker_26.0.0-cli-alpine3.19/modprobe.sh b/docker_26.0.1-cli-alpine3.19/modprobe.sh
similarity index 100%
rename from docker_26.0.0-cli-alpine3.19/modprobe.sh
rename to docker_26.0.1-cli-alpine3.19/modprobe.sh
diff --git a/docker_dind-rootless/Dockerfile b/docker_dind-rootless/Dockerfile
index f816436..170c855 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-26.0.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.0.1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.0.0.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.0.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 5b7a12d..507cdb8 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 26.0.0
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.0.zip
+ENV DOCKER_VERSION 26.0.1
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.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 879dcd0..7164cf6 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 26.0.0
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.0.zip
+ENV DOCKER_VERSION 26.0.1
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.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
approved these changes
Apr 11, 2024
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: