Update docker #16644
Merged
Update docker #16644
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@9b4db7b: Update 26 to 26.1.0
Diff for 2670496:diff --git a/_bashbrew-cat b/_bashbrew-cat
index ccf7ddd..b7e4d44 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -64,33 +64,33 @@ Directory: 25/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
-Tags: 26.0.2-cli, 26.0-cli, 26-cli, cli, 26.0.2-cli-alpine3.19
+Tags: 26.1.0-cli, 26.1-cli, 26-cli, cli, 26.1.0-cli-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: e73d98fe46a0a7b99be6ce69cc6406ff5a7d94a0
+GitCommit: 9b4db7b1b1edb202cf2a8046174d835a4cec70e0
Directory: 26/cli
-Tags: 26.0.2-dind, 26.0-dind, 26-dind, dind, 26.0.2-dind-alpine3.19, 26.0.2, 26.0, 26, latest, 26.0.2-alpine3.19
+Tags: 26.1.0-dind, 26.1-dind, 26-dind, dind, 26.1.0-dind-alpine3.19, 26.1.0, 26.1, 26, latest, 26.1.0-alpine3.19
Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: e73d98fe46a0a7b99be6ce69cc6406ff5a7d94a0
+GitCommit: 9b4db7b1b1edb202cf2a8046174d835a4cec70e0
Directory: 26/dind
-Tags: 26.0.2-dind-rootless, 26.0-dind-rootless, 26-dind-rootless, dind-rootless
+Tags: 26.1.0-dind-rootless, 26.1-dind-rootless, 26-dind-rootless, dind-rootless
Architectures: amd64, arm64v8
-GitCommit: e73d98fe46a0a7b99be6ce69cc6406ff5a7d94a0
+GitCommit: 9b4db7b1b1edb202cf2a8046174d835a4cec70e0
Directory: 26/dind-rootless
-Tags: 26.0.2-windowsservercore-1809, 26.0-windowsservercore-1809, 26-windowsservercore-1809, windowsservercore-1809
-SharedTags: 26.0.2-windowsservercore, 26.0-windowsservercore, 26-windowsservercore, windowsservercore
+Tags: 26.1.0-windowsservercore-1809, 26.1-windowsservercore-1809, 26-windowsservercore-1809, windowsservercore-1809
+SharedTags: 26.1.0-windowsservercore, 26.1-windowsservercore, 26-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: e73d98fe46a0a7b99be6ce69cc6406ff5a7d94a0
+GitCommit: 9b4db7b1b1edb202cf2a8046174d835a4cec70e0
Directory: 26/windows/windowsservercore-1809
Builder: classic
Constraints: windowsservercore-1809
-Tags: 26.0.2-windowsservercore-ltsc2022, 26.0-windowsservercore-ltsc2022, 26-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 26.0.2-windowsservercore, 26.0-windowsservercore, 26-windowsservercore, windowsservercore
+Tags: 26.1.0-windowsservercore-ltsc2022, 26.1-windowsservercore-ltsc2022, 26-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 26.1.0-windowsservercore, 26.1-windowsservercore, 26-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: e73d98fe46a0a7b99be6ce69cc6406ff5a7d94a0
+GitCommit: 9b4db7b1b1edb202cf2a8046174d835a4cec70e0
Directory: 26/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 32f35d5..8b77fa0 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -59,23 +59,23 @@ docker:26-dind-rootless
docker:26-windowsservercore
docker:26-windowsservercore-1809
docker:26-windowsservercore-ltsc2022
-docker:26.0
-docker:26.0-cli
-docker:26.0-dind
-docker:26.0-dind-rootless
-docker:26.0-windowsservercore
-docker:26.0-windowsservercore-1809
-docker:26.0-windowsservercore-ltsc2022
-docker:26.0.2
-docker:26.0.2-alpine3.19
-docker:26.0.2-cli
-docker:26.0.2-cli-alpine3.19
-docker:26.0.2-dind
-docker:26.0.2-dind-alpine3.19
-docker:26.0.2-dind-rootless
-docker:26.0.2-windowsservercore
-docker:26.0.2-windowsservercore-1809
-docker:26.0.2-windowsservercore-ltsc2022
+docker:26.1
+docker:26.1-cli
+docker:26.1-dind
+docker:26.1-dind-rootless
+docker:26.1-windowsservercore
+docker:26.1-windowsservercore-1809
+docker:26.1-windowsservercore-ltsc2022
+docker:26.1.0
+docker:26.1.0-alpine3.19
+docker:26.1.0-cli
+docker:26.1.0-cli-alpine3.19
+docker:26.1.0-dind
+docker:26.1.0-dind-alpine3.19
+docker:26.1.0-dind-rootless
+docker:26.1.0-windowsservercore
+docker:26.1.0-windowsservercore-1809
+docker:26.1.0-windowsservercore-ltsc2022
docker:cli
docker:dind
docker:dind-rootless
diff --git a/docker_26.0.2-alpine3.19/Dockerfile b/docker_26.1.0-alpine3.19/Dockerfile
similarity index 97%
rename from docker_26.0.2-alpine3.19/Dockerfile
rename to docker_26.1.0-alpine3.19/Dockerfile
index 11a531e..90365a1 100644
--- a/docker_26.0.2-alpine3.19/Dockerfile
+++ b/docker_26.1.0-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.2.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.0.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-26.0.2.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-26.1.0.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.2.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.0.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.2.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.0.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_26.0.2-alpine3.19/dockerd-entrypoint.sh b/docker_26.1.0-alpine3.19/dockerd-entrypoint.sh
similarity index 100%
rename from docker_26.0.2-alpine3.19/dockerd-entrypoint.sh
rename to docker_26.1.0-alpine3.19/dockerd-entrypoint.sh
diff --git a/docker_26.0.2-cli-alpine3.19/Dockerfile b/docker_26.1.0-cli-alpine3.19/Dockerfile
similarity index 98%
rename from docker_26.0.2-cli-alpine3.19/Dockerfile
rename to docker_26.1.0-cli-alpine3.19/Dockerfile
index 40b8092..415c984 100644
--- a/docker_26.0.2-cli-alpine3.19/Dockerfile
+++ b/docker_26.1.0-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.2
+ENV DOCKER_VERSION 26.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-26.0.2.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-26.1.0.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-26.0.2.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-26.1.0.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-26.0.2.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-26.1.0.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-26.0.2.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-26.1.0.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_26.0.2-cli-alpine3.19/docker-entrypoint.sh b/docker_26.1.0-cli-alpine3.19/docker-entrypoint.sh
similarity index 100%
rename from docker_26.0.2-cli-alpine3.19/docker-entrypoint.sh
rename to docker_26.1.0-cli-alpine3.19/docker-entrypoint.sh
diff --git a/docker_26.0.2-cli-alpine3.19/modprobe.sh b/docker_26.1.0-cli-alpine3.19/modprobe.sh
similarity index 100%
rename from docker_26.0.2-cli-alpine3.19/modprobe.sh
rename to docker_26.1.0-cli-alpine3.19/modprobe.sh
diff --git a/docker_dind-rootless/Dockerfile b/docker_dind-rootless/Dockerfile
index 8d8a10b..e162e20 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.2.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-26.1.0.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.0.2.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-26.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 f10b7ba..d0fcb1b 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.2
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.2.zip
+ENV DOCKER_VERSION 26.1.0
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.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 8d970bb..8730a3e 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.2
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.0.2.zip
+ENV DOCKER_VERSION 26.1.0
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-26.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: |
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: