Update docker #16332
Merged
Update docker #16332
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@9ee39ba: Merge pull request docker-library/docker#484 from jnoordsij/add-26-rc - docker-library/docker@cc424ac: Add v26.0.0-rc1 pre-release
Diff for 5f2bb05:diff --git a/_bashbrew-cat b/_bashbrew-cat
index ab04955..4e16a3e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -63,3 +63,34 @@ GitCommit: c0a2a6d85dab907b5a9349f7a25eb7eadbbfa4ea
Directory: 25/windows/windowsservercore-ltsc2022
Builder: classic
Constraints: windowsservercore-ltsc2022
+
+Tags: 26.0.0-rc1-cli, 26-rc-cli, rc-cli, 26.0.0-rc1-cli-alpine3.19
+Architectures: amd64, arm32v6, arm32v7, arm64v8
+GitCommit: cc424ac96c2c90487f0c6b4cf044fada91dcc6a2
+Directory: 26-rc/cli
+
+Tags: 26.0.0-rc1-dind, 26-rc-dind, rc-dind, 26.0.0-rc1-dind-alpine3.19, 26.0.0-rc1, 26-rc, rc, 26.0.0-rc1-alpine3.19
+Architectures: amd64, arm32v6, arm32v7, arm64v8
+GitCommit: cc424ac96c2c90487f0c6b4cf044fada91dcc6a2
+Directory: 26-rc/dind
+
+Tags: 26.0.0-rc1-dind-rootless, 26-rc-dind-rootless, rc-dind-rootless
+Architectures: amd64, arm64v8
+GitCommit: cc424ac96c2c90487f0c6b4cf044fada91dcc6a2
+Directory: 26-rc/dind-rootless
+
+Tags: 26.0.0-rc1-windowsservercore-1809, 26-rc-windowsservercore-1809, rc-windowsservercore-1809
+SharedTags: 26.0.0-rc1-windowsservercore, 26-rc-windowsservercore, rc-windowsservercore
+Architectures: windows-amd64
+GitCommit: cc424ac96c2c90487f0c6b4cf044fada91dcc6a2
+Directory: 26-rc/windows/windowsservercore-1809
+Builder: classic
+Constraints: windowsservercore-1809
+
+Tags: 26.0.0-rc1-windowsservercore-ltsc2022, 26-rc-windowsservercore-ltsc2022, rc-windowsservercore-ltsc2022
+SharedTags: 26.0.0-rc1-windowsservercore, 26-rc-windowsservercore, rc-windowsservercore
+Architectures: windows-amd64
+GitCommit: cc424ac96c2c90487f0c6b4cf044fada91dcc6a2
+Directory: 26-rc/windows/windowsservercore-ltsc2022
+Builder: classic
+Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 1d2ff14..5abb626 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -52,11 +52,35 @@ docker:25.0.3-git
docker:25.0.3-windowsservercore
docker:25.0.3-windowsservercore-1809
docker:25.0.3-windowsservercore-ltsc2022
+docker:26-rc
+docker:26-rc-cli
+docker:26-rc-dind
+docker:26-rc-dind-rootless
+docker:26-rc-windowsservercore
+docker:26-rc-windowsservercore-1809
+docker:26-rc-windowsservercore-ltsc2022
+docker:26.0.0-rc1
+docker:26.0.0-rc1-alpine3.19
+docker:26.0.0-rc1-cli
+docker:26.0.0-rc1-cli-alpine3.19
+docker:26.0.0-rc1-dind
+docker:26.0.0-rc1-dind-alpine3.19
+docker:26.0.0-rc1-dind-rootless
+docker:26.0.0-rc1-windowsservercore
+docker:26.0.0-rc1-windowsservercore-1809
+docker:26.0.0-rc1-windowsservercore-ltsc2022
docker:cli
docker:dind
docker:dind-rootless
docker:git
docker:latest
+docker:rc
+docker:rc-cli
+docker:rc-dind
+docker:rc-dind-rootless
+docker:rc-windowsservercore
+docker:rc-windowsservercore-1809
+docker:rc-windowsservercore-ltsc2022
docker:windowsservercore
docker:windowsservercore-1809
docker:windowsservercore-ltsc2022
diff --git a/docker_24.0.9-alpine3.19/Dockerfile b/docker_26.0.0-rc1-alpine3.19/Dockerfile
similarity index 85%
copy from docker_24.0.9-alpine3.19/Dockerfile
copy to docker_26.0.0-rc1-alpine3.19/Dockerfile
index ab0aa3d..d319d34 100644
--- a/docker_24.0.9-alpine3.19/Dockerfile
+++ b/docker_26.0.0-rc1-alpine3.19/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM docker:24-cli
+FROM docker:26-rc-cli
# https://github.com/moby/moby/blob/0eecd59153c03ced5f5ddd79cc98f29e4d86daec/project/PACKAGERS.md#runtime-dependencies
# https://github.com/docker/docker-ce-packaging/blob/963aa02666035d4e268f33c63d7868d6cdd1d34c/deb/common/control#L28-L41
@@ -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-24.0.9.tgz'; \
+ url='https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc1.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-24.0.9.tgz'; \
+ url='https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc1.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-24.0.9.tgz'; \
+ url='https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-24.0.9.tgz'; \
+ url='https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
@@ -82,7 +82,7 @@ RUN set -eux; \
--strip-components 1 \
--directory /usr/local/bin/ \
--no-same-owner \
-# we exclude the CLI binary because we already extracted that over in the "docker:24-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer
+# we exclude the CLI binary because we already extracted that over in the "docker:26-rc-cli" image that we're FROM and we don't want to duplicate those bytes again in this layer
--exclude 'docker/docker' \
; \
rm docker.tgz; \
diff --git a/docker_24.0.9-alpine3.19/dockerd-entrypoint.sh b/docker_26.0.0-rc1-alpine3.19/dockerd-entrypoint.sh
similarity index 100%
copy from docker_24.0.9-alpine3.19/dockerd-entrypoint.sh
copy to docker_26.0.0-rc1-alpine3.19/dockerd-entrypoint.sh
diff --git a/docker_25.0.3-cli-alpine3.19/Dockerfile b/docker_26.0.0-rc1-cli-alpine3.19/Dockerfile
similarity index 94%
copy from docker_25.0.3-cli-alpine3.19/Dockerfile
copy to docker_26.0.0-rc1-cli-alpine3.19/Dockerfile
index cb17c44..83f29d5 100644
--- a/docker_25.0.3-cli-alpine3.19/Dockerfile
+++ b/docker_26.0.0-rc1-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 25.0.3
+ENV DOCKER_VERSION 26.0.0-rc1
RUN set -eux; \
\
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
'x86_64') \
- url='https://download.docker.com/linux/static/stable/x86_64/docker-25.0.3.tgz'; \
+ url='https://download.docker.com/linux/static/test/x86_64/docker-26.0.0-rc1.tgz'; \
;; \
'armhf') \
- url='https://download.docker.com/linux/static/stable/armel/docker-25.0.3.tgz'; \
+ url='https://download.docker.com/linux/static/test/armel/docker-26.0.0-rc1.tgz'; \
;; \
'armv7') \
- url='https://download.docker.com/linux/static/stable/armhf/docker-25.0.3.tgz'; \
+ url='https://download.docker.com/linux/static/test/armhf/docker-26.0.0-rc1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-25.0.3.tgz'; \
+ url='https://download.docker.com/linux/static/test/aarch64/docker-26.0.0-rc1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'docker.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_24.0.9-cli-alpine3.19/docker-entrypoint.sh b/docker_26.0.0-rc1-cli-alpine3.19/docker-entrypoint.sh
similarity index 100%
copy from docker_24.0.9-cli-alpine3.19/docker-entrypoint.sh
copy to docker_26.0.0-rc1-cli-alpine3.19/docker-entrypoint.sh
diff --git a/docker_24.0.9-cli-alpine3.19/modprobe.sh b/docker_26.0.0-rc1-cli-alpine3.19/modprobe.sh
similarity index 100%
copy from docker_24.0.9-cli-alpine3.19/modprobe.sh
copy to docker_26.0.0-rc1-cli-alpine3.19/modprobe.sh
diff --git a/docker_24-dind-rootless/Dockerfile b/docker_rc-dind-rootless/Dockerfile
similarity index 86%
copy from docker_24-dind-rootless/Dockerfile
copy to docker_rc-dind-rootless/Dockerfile
index e105f64..e4cc7b7 100644
--- a/docker_24-dind-rootless/Dockerfile
+++ b/docker_rc-dind-rootless/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM docker:24-dind
+FROM docker:26-rc-dind
# busybox "ip" is insufficient:
# [rootlesskit:child ] error: executing [[ip tuntap add name tap0 mode tap] [ip link set tap0 address 02:50:00:00:00:01]]: exit status 1
@@ -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.9.tgz'; \
+ url='https://download.docker.com/linux/static/test/x86_64/docker-rootless-extras-26.0.0-rc1.tgz'; \
;; \
'aarch64') \
- url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-24.0.9.tgz'; \
+ url='https://download.docker.com/linux/static/test/aarch64/docker-rootless-extras-26.0.0-rc1.tgz'; \
;; \
*) echo >&2 "error: unsupported 'rootless.tgz' architecture ($apkArch)"; exit 1 ;; \
esac; \
diff --git a/docker_windowsservercore-1809/Dockerfile b/docker_rc-windowsservercore-1809/Dockerfile
similarity index 96%
copy from docker_windowsservercore-1809/Dockerfile
copy to docker_rc-windowsservercore-1809/Dockerfile
index 27f3e2b..e1f5c6f 100644
--- a/docker_windowsservercore-1809/Dockerfile
+++ b/docker_rc-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 25.0.3
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.3.zip
+ENV DOCKER_VERSION 26.0.0-rc1
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc1.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_rc-windowsservercore-ltsc2022/Dockerfile
similarity index 96%
copy from docker_windowsservercore-ltsc2022/Dockerfile
copy to docker_rc-windowsservercore-ltsc2022/Dockerfile
index 91a0a77..663d053 100644
--- a/docker_windowsservercore-ltsc2022/Dockerfile
+++ b/docker_rc-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 25.0.3
-ENV DOCKER_URL https://download.docker.com/win/static/stable/x86_64/docker-25.0.3.zip
+ENV DOCKER_VERSION 26.0.0-rc1
+ENV DOCKER_URL https://download.docker.com/win/static/test/x86_64/docker-26.0.0-rc1.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
Feb 29, 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: