Update docker #15317
Merged
Update docker #15317
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@12a4554: Update 24 to 24.0.6
Diff for ae12b2c:diff --git a/_bashbrew-cat b/_bashbrew-cat
index bab1280..ed65560 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -38,38 +38,38 @@ Directory: 23/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
-Tags: 24.0.5-cli, 24.0-cli, 24-cli, cli, 24.0.5-cli-alpine3.18
+Tags: 24.0.6-cli, 24.0-cli, 24-cli, cli, 24.0.6-cli-alpine3.18
Architectures: amd64, arm64v8
-GitCommit: e7e25ec90b6db2e33b276aabfadcf580825a0fe8
+GitCommit: 12a4554648b671111eaf4cf4636cb1d6310c65e1
Directory: 24/cli
-Tags: 24.0.5-dind, 24.0-dind, 24-dind, dind, 24.0.5-dind-alpine3.18, 24.0.5, 24.0, 24, latest, 24.0.5-alpine3.18
+Tags: 24.0.6-dind, 24.0-dind, 24-dind, dind, 24.0.6-dind-alpine3.18, 24.0.6, 24.0, 24, latest, 24.0.6-alpine3.18
Architectures: amd64, arm64v8
-GitCommit: f6bb49f0c0e7ed0ab489df14b53e26cc65c294d6
+GitCommit: 12a4554648b671111eaf4cf4636cb1d6310c65e1
Directory: 24/dind
-Tags: 24.0.5-dind-rootless, 24.0-dind-rootless, 24-dind-rootless, dind-rootless
+Tags: 24.0.6-dind-rootless, 24.0-dind-rootless, 24-dind-rootless, dind-rootless
Architectures: amd64, arm64v8
-GitCommit: f6bb49f0c0e7ed0ab489df14b53e26cc65c294d6
+GitCommit: 12a4554648b671111eaf4cf4636cb1d6310c65e1
Directory: 24/dind-rootless
-Tags: 24.0.5-git, 24.0-git, 24-git, git
+Tags: 24.0.6-git, 24.0-git, 24-git, git
Architectures: amd64, arm64v8
GitCommit: 6964fd52030c2e6e9e0943eaac07d78c9841fbb3
Directory: 24/git
-Tags: 24.0.5-windowsservercore-1809, 24.0-windowsservercore-1809, 24-windowsservercore-1809, windowsservercore-1809
-SharedTags: 24.0.5-windowsservercore, 24.0-windowsservercore, 24-windowsservercore, windowsservercore
+Tags: 24.0.6-windowsservercore-1809, 24.0-windowsservercore-1809, 24-windowsservercore-1809, windowsservercore-1809
+SharedTags: 24.0.6-windowsservercore, 24.0-windowsservercore, 24-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: e7e25ec90b6db2e33b276aabfadcf580825a0fe8
+GitCommit: 12a4554648b671111eaf4cf4636cb1d6310c65e1
Directory: 24/windows/windowsservercore-1809
Builder: classic
Constraints: windowsservercore-1809
-Tags: 24.0.5-windowsservercore-ltsc2022, 24.0-windowsservercore-ltsc2022, 24-windowsservercore-ltsc2022, windowsservercore-ltsc2022
-SharedTags: 24.0.5-windowsservercore, 24.0-windowsservercore, 24-windowsservercore, windowsservercore
+Tags: 24.0.6-windowsservercore-ltsc2022, 24.0-windowsservercore-ltsc2022, 24-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+SharedTags: 24.0.6-windowsservercore, 24.0-windowsservercore, 24-windowsservercore, windowsservercore
Architectures: windows-amd64
-GitCommit: e7e25ec90b6db2e33b276aabfadcf580825a0fe8
+GitCommit: 12a4554648b671111eaf4cf4636cb1d6310c65e1
Directory: 24/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 311f543..b737fd1 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -41,17 +41,17 @@ docker:24.0-git
docker:24.0-windowsservercore
docker:24.0-windowsservercore-1809
docker:24.0-windowsservercore-ltsc2022
-docker:24.0.5
-docker:24.0.5-alpine3.18
-docker:24.0.5-cli
-docker:24.0.5-cli-alpine3.18
-docker:24.0.5-dind
-docker:24.0.5-dind-alpine3.18
-docker:24.0.5-dind-rootless
-docker:24.0.5-git
-docker:24.0.5-windowsservercore
-docker:24.0.5-windowsservercore-1809
-docker:24.0.5-windowsservercore-ltsc2022
+docker:24.0.6
+docker:24.0.6-alpine3.18
+docker:24.0.6-cli
+docker:24.0.6-cli-alpine3.18
+docker:24.0.6-dind
+docker:24.0.6-dind-alpine3.18
+docker:24.0.6-dind-rootless
+docker:24.0.6-git
+docker:24.0.6-windowsservercore
+docker:24.0.6-windowsservercore-1809
+docker:24.0.6-windowsservercore-ltsc2022
docker:cli
docker:dind
docker:dind-rootless
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 17d23d2..cabf2db 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -4,8 +4,8 @@ docker:23-dind-rootless
docker:23-git
docker:23-windowsservercore-1809
docker:23-windowsservercore-ltsc2022
-docker:24.0.5-cli-alpine3.18
-docker:24.0.5-alpine3.18
+docker:24.0.6-cli-alpine3.18
+docker:24.0.6-alpine3.18
docker:dind-rootless
docker:git
docker:windowsservercore-1809
diff --git a/docker_24.0.5-alpine3.18/Dockerfile b/docker_24.0.6-alpine3.18/Dockerfile
similarity index 96%
rename from docker_24.0.5-alpine3.18/Dockerfile
rename to docker_24.0.6-alpine3.18/Dockerfile
index d5d2069..8733b14 100644
--- a/docker_24.0.5-alpine3.18/Dockerfile
+++ b/docker_24.0.6-alpine3.18/Dockerfile
@@ -42,16 +42,16 @@ RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.5.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.6.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-24.0.5.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-24.0.6.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.5.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.6.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.5.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.6.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_24.0.5-alpine3.18/dockerd-entrypoint.sh b/docker_24.0.6-alpine3.18/dockerd-entrypoint.sh
similarity index 100%
rename from docker_24.0.5-alpine3.18/dockerd-entrypoint.sh
rename to docker_24.0.6-alpine3.18/dockerd-entrypoint.sh
diff --git a/docker_24.0.5-cli-alpine3.18/Dockerfile b/docker_24.0.6-cli-alpine3.18/Dockerfile
similarity index 98%
rename from docker_24.0.5-cli-alpine3.18/Dockerfile
rename to docker_24.0.6-cli-alpine3.18/Dockerfile
index db6cec8..aa5bea6 100644
--- a/docker_24.0.5-cli-alpine3.18/Dockerfile
+++ b/docker_24.0.6-cli-alpine3.18/Dockerfile
@@ -17,23 +17,23 @@ RUN apk add --no-cache \
# - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf
RUN [ -e /etc/nsswitch.conf ] && grep '^hosts: files dns' /etc/nsswitch.conf
-ENV DOCKER_VERSION 24.0.5
+ENV DOCKER_VERSION 24.0.6
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.5.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-24.0.6.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-24.0.5.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armel/docker-24.0.6.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.5.tgz'; \
+ url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.6.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.5.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.6.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_24.0.5-cli-alpine3.18/docker-entrypoint.sh b/docker_24.0.6-cli-alpine3.18/docker-entrypoint.sh
similarity index 100%
rename from docker_24.0.5-cli-alpine3.18/docker-entrypoint.sh
rename to docker_24.0.6-cli-alpine3.18/docker-entrypoint.sh
diff --git a/docker_24.0.5-cli-alpine3.18/modprobe.sh b/docker_24.0.6-cli-alpine3.18/modprobe.sh
similarity index 100%
rename from docker_24.0.5-cli-alpine3.18/modprobe.sh
rename to docker_24.0.6-cli-alpine3.18/modprobe.sh
diff --git a/docker_dind-rootless/Dockerfile b/docker_dind-rootless/Dockerfile
index 4a7d1c9..766214d 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-24.0.5.tgz'; \
+ url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-24.0.6.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.5.tgz'; \
+ url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.6.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 c57a285..e96e4a7 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 24.0.5
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.5.zip
+ENV DOCKER_VERSION 24.0.6
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.6.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 5be3762..18386d8 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 24.0.5
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.5.zip
+ENV DOCKER_VERSION 24.0.6
+ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-24.0.6.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: