Update docker #14666
Merged
Update docker #14666
+3
−39
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@3772e45: Merge pull request docker-library/docker#426 from infosiftr/rm-20.10 - docker-library/docker@a3ca225: Remove 20.10 - docker-library/docker@3013477: Update README.md
Diff for bc7ad0e:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 9e91dfc..9879241 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,42 +2,6 @@ Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson
GitRepo: https://github.com/docker-library/docker.git
Builder: buildkit
-Tags: 20.10.24-cli, 20.10-cli, 20-cli, 20.10.24-cli-alpine3.18, 20.10.24, 20.10, 20, 20.10.24-alpine3.18
-Architectures: amd64, arm64v8
-GitCommit: 1e7a4c385eee982a26601ba6279ae6e6b52ea8d8
-Directory: 20.10/cli
-
-Tags: 20.10.24-dind, 20.10-dind, 20-dind, 20.10.24-dind-alpine3.18
-Architectures: amd64, arm64v8
-GitCommit: d71ed6659319c2608be2290c581787d2d4779ef2
-Directory: 20.10/dind
-
-Tags: 20.10.24-dind-rootless, 20.10-dind-rootless, 20-dind-rootless
-Architectures: amd64, arm64v8
-GitCommit: d71ed6659319c2608be2290c581787d2d4779ef2
-Directory: 20.10/dind-rootless
-
-Tags: 20.10.24-git, 20.10-git, 20-git
-Architectures: amd64, arm64v8
-GitCommit: f23a2bea97f6d7ec563bc316302fb8edf620ec5b
-Directory: 20.10/git
-
-Tags: 20.10.24-windowsservercore-1809, 20.10-windowsservercore-1809, 20-windowsservercore-1809
-SharedTags: 20.10.24-windowsservercore, 20.10-windowsservercore, 20-windowsservercore
-Architectures: windows-amd64
-GitCommit: 7bdd5e0d531739e1e329c939bd6d24baaffd4570
-Directory: 20.10/windows/windowsservercore-1809
-Builder: classic
-Constraints: windowsservercore-1809
-
-Tags: 20.10.24-windowsservercore-ltsc2022, 20.10-windowsservercore-ltsc2022, 20-windowsservercore-ltsc2022
-SharedTags: 20.10.24-windowsservercore, 20.10-windowsservercore, 20-windowsservercore
-Architectures: windows-amd64
-GitCommit: 7bdd5e0d531739e1e329c939bd6d24baaffd4570
-Directory: 20.10/windows/windowsservercore-ltsc2022
-Builder: classic
-Constraints: windowsservercore-ltsc2022
-
Tags: 23.0.6-cli, 23.0-cli, 23-cli, cli, 23.0.6-cli-alpine3.18
Architectures: amd64, arm64v8
GitCommit: 1e7a4c385eee982a26601ba6279ae6e6b52ea8d8
@@ -45,7 +9,7 @@ Directory: 23.0/cli
Tags: 23.0.6-dind, 23.0-dind, 23-dind, dind, 23.0.6-dind-alpine3.18, 23.0.6, 23.0, 23, latest, 23.0.6-alpine3.18
Architectures: amd64, arm64v8
-GitCommit: 3f698e446071ef052c3bd70fe0322493dbfd5103
+GitCommit: a3ca225e9c0e568cf87a7b60c951b939c3964c91
Directory: 23.0/dind
Tags: 23.0.6-dind-rootless, 23.0-dind-rootless, 23-dind-rootless, dind-rootless
@@ -81,7 +45,7 @@ Directory: 24-rc/cli
Tags: 24.0.0-rc.4-dind, 24-rc-dind, rc-dind, 24.0.0-rc.4-dind-alpine3.18, 24.0.0-rc.4, 24-rc, rc, 24.0.0-rc.4-alpine3.18
Architectures: amd64, arm64v8
-GitCommit: 38d8c1da029024c9f6cbfb306bdaf8461b3b5914
+GitCommit: a3ca225e9c0e568cf87a7b60c951b939c3964c91
Directory: 24-rc/dind
Tags: 24.0.0-rc.4-dind-rootless, 24-rc-dind-rootless, rc-dind-rootless
diff --git a/_bashbrew-list b/_bashbrew-list
index bec83f0..75f8eaf 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,30 +1,3 @@
-docker:20
-docker:20-cli
-docker:20-dind
-docker:20-dind-rootless
-docker:20-git
-docker:20-windowsservercore
-docker:20-windowsservercore-1809
-docker:20-windowsservercore-ltsc2022
-docker:20.10
-docker:20.10-cli
-docker:20.10-dind
-docker:20.10-dind-rootless
-docker:20.10-git
-docker:20.10-windowsservercore
-docker:20.10-windowsservercore-1809
-docker:20.10-windowsservercore-ltsc2022
-docker:20.10.24
-docker:20.10.24-alpine3.18
-docker:20.10.24-cli
-docker:20.10.24-cli-alpine3.18
-docker:20.10.24-dind
-docker:20.10.24-dind-alpine3.18
-docker:20.10.24-dind-rootless
-docker:20.10.24-git
-docker:20.10.24-windowsservercore
-docker:20.10.24-windowsservercore-1809
-docker:20.10.24-windowsservercore-ltsc2022
docker:23
docker:23-cli
docker:23-dind
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index db11548..654e9fb 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,9 +1,3 @@
-docker:20.10.24-alpine3.18
-docker:20.10.24-dind-alpine3.18
-docker:20-dind-rootless
-docker:20-git
-docker:20-windowsservercore-1809
-docker:20-windowsservercore-ltsc2022
docker:23.0.6-cli-alpine3.18
docker:23.0.6-alpine3.18
docker:dind-rootless
diff --git a/docker_20-dind-rootless/Dockerfile b/docker_20-dind-rootless/Dockerfile
deleted file mode 100644
index 8e60ecb..0000000
diff --git a/docker_20-git/Dockerfile b/docker_20-git/Dockerfile
deleted file mode 100644
index 8851cd7..0000000
diff --git a/docker_20-windowsservercore-1809/Dockerfile b/docker_20-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 310a28f..0000000
diff --git a/docker_20-windowsservercore-ltsc2022/Dockerfile b/docker_20-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index 824b5a6..0000000
diff --git a/docker_20.10.24-alpine3.18/Dockerfile b/docker_20.10.24-alpine3.18/Dockerfile
deleted file mode 100644
index 78e574e..0000000
diff --git a/docker_20.10.24-alpine3.18/docker-entrypoint.sh b/docker_20.10.24-alpine3.18/docker-entrypoint.sh
deleted file mode 100755
index d41cef8..0000000
diff --git a/docker_20.10.24-alpine3.18/modprobe.sh b/docker_20.10.24-alpine3.18/modprobe.sh
deleted file mode 100755
index b357d89..0000000
diff --git a/docker_20.10.24-dind-alpine3.18/Dockerfile b/docker_20.10.24-dind-alpine3.18/Dockerfile
deleted file mode 100644
index 74e1f1b..0000000
diff --git a/docker_20.10.24-dind-alpine3.18/dockerd-entrypoint.sh b/docker_20.10.24-dind-alpine3.18/dockerd-entrypoint.sh
deleted file mode 100755
index 0dd29c1..0000000
diff --git a/docker_23.0.6-alpine3.18/dockerd-entrypoint.sh b/docker_23.0.6-alpine3.18/dockerd-entrypoint.sh
index 0dd29c1..0081938 100755
--- a/docker_23.0.6-alpine3.18/dockerd-entrypoint.sh
+++ b/docker_23.0.6-alpine3.18/dockerd-entrypoint.sh
@@ -140,10 +140,8 @@ if [ "$1" = 'dockerd' ]; then
# explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file)
find /run /var/run -iname 'docker*.pid' -delete || :
- if dockerd --version | grep -qF ' 20.10.'; then
# XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes)
set -- docker-init -- "$@"
- fi
if ! iptables -nL > /dev/null 2>&1; then
# if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example)
diff --git a/docker_24.0.0-rc.4-alpine3.18/dockerd-entrypoint.sh b/docker_24.0.0-rc.4-alpine3.18/dockerd-entrypoint.sh
index 0dd29c1..0081938 100755
--- a/docker_24.0.0-rc.4-alpine3.18/dockerd-entrypoint.sh
+++ b/docker_24.0.0-rc.4-alpine3.18/dockerd-entrypoint.sh
@@ -140,10 +140,8 @@ if [ "$1" = 'dockerd' ]; then
# explicitly remove Docker's default PID file to ensure that it can start properly if it was stopped uncleanly (and thus didn't clean up the PID file)
find /run /var/run -iname 'docker*.pid' -delete || :
- if dockerd --version | grep -qF ' 20.10.'; then
# XXX inject "docker-init" (tini) as pid1 to workaround https://github.com/docker-library/docker/issues/318 (zombie container-shim processes)
set -- docker-init -- "$@"
- fi
if ! iptables -nL > /dev/null 2>&1; then
# if iptables fails to run, chances are high the necessary kernel modules aren't loaded (perhaps the host is using nftables with the translating "iptables" wrappers, for example)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: