Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docker #17285

Merged
merged 1 commit into from
Jul 31, 2024
Merged

Update docker #17285

merged 1 commit into from
Jul 31, 2024

Conversation

tianon
Copy link
Member

@tianon tianon commented Jul 31, 2024

Changes:

Changes:

- docker-library/docker@73a3f35: Merge pull request docker-library/docker#506 from infosiftr/rm-old
- docker-library/docker@5084052: Remove versions that won't get more Docker, Inc builds
@tianon tianon requested a review from a team as a code owner July 31, 2024 16:38
Copy link

Diff for 0dd1fd0:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 661b708..7916943 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,99 +2,6 @@ Maintainers: Tianon Gravi <[email protected]> (@tianon), Joseph Ferguson
 GitRepo: https://github.com/docker-library/docker.git
 Builder: buildkit
 
-Tags: 24.0.9-cli, 24.0-cli, 24-cli, 24.0.9-cli-alpine3.20
-Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 3b9c6eaa290cb4a3f54179a27dcd9036971a6bb4
-Directory: 24/cli
-
-Tags: 24.0.9-dind, 24.0-dind, 24-dind, 24.0.9-dind-alpine3.20, 24.0.9-git, 24.0-git, 24-git, 24.0.9, 24.0, 24, 24.0.9-alpine3.20
-Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 12a00d721d4d84bd69ffd4a69f1f2851751ac2d9
-Directory: 24/dind
-
-Tags: 24.0.9-dind-rootless, 24.0-dind-rootless, 24-dind-rootless
-Architectures: amd64, arm64v8
-GitCommit: faa16b36dd3257f8b020489d44fd7a339f11701d
-Directory: 24/dind-rootless
-
-Tags: 24.0.9-windowsservercore-1809, 24.0-windowsservercore-1809, 24-windowsservercore-1809
-SharedTags: 24.0.9-windowsservercore, 24.0-windowsservercore, 24-windowsservercore
-Architectures: windows-amd64
-GitCommit: 3b9c6eaa290cb4a3f54179a27dcd9036971a6bb4
-Directory: 24/windows/windowsservercore-1809
-Builder: classic
-Constraints: windowsservercore-1809
-
-Tags: 24.0.9-windowsservercore-ltsc2022, 24.0-windowsservercore-ltsc2022, 24-windowsservercore-ltsc2022
-SharedTags: 24.0.9-windowsservercore, 24.0-windowsservercore, 24-windowsservercore
-Architectures: windows-amd64
-GitCommit: 3b9c6eaa290cb4a3f54179a27dcd9036971a6bb4
-Directory: 24/windows/windowsservercore-ltsc2022
-Builder: classic
-Constraints: windowsservercore-ltsc2022
-
-Tags: 25.0.5-cli, 25.0-cli, 25-cli, 25.0.5-cli-alpine3.20
-Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: ad85990a80623b66f91fb7e8f3ef3fa1f3f9c187
-Directory: 25/cli
-
-Tags: 25.0.5-dind, 25.0-dind, 25-dind, 25.0.5-dind-alpine3.20, 25.0.5-git, 25.0-git, 25-git, 25.0.5, 25.0, 25, 25.0.5-alpine3.20
-Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 12a00d721d4d84bd69ffd4a69f1f2851751ac2d9
-Directory: 25/dind
-
-Tags: 25.0.5-dind-rootless, 25.0-dind-rootless, 25-dind-rootless
-Architectures: amd64, arm64v8
-GitCommit: a40d64fc2cc3b417f9408d3b1c539ec860780e86
-Directory: 25/dind-rootless
-
-Tags: 25.0.5-windowsservercore-1809, 25.0-windowsservercore-1809, 25-windowsservercore-1809
-SharedTags: 25.0.5-windowsservercore, 25.0-windowsservercore, 25-windowsservercore
-Architectures: windows-amd64
-GitCommit: ad85990a80623b66f91fb7e8f3ef3fa1f3f9c187
-Directory: 25/windows/windowsservercore-1809
-Builder: classic
-Constraints: windowsservercore-1809
-
-Tags: 25.0.5-windowsservercore-ltsc2022, 25.0-windowsservercore-ltsc2022, 25-windowsservercore-ltsc2022
-SharedTags: 25.0.5-windowsservercore, 25.0-windowsservercore, 25-windowsservercore
-Architectures: windows-amd64
-GitCommit: ad85990a80623b66f91fb7e8f3ef3fa1f3f9c187
-Directory: 25/windows/windowsservercore-ltsc2022
-Builder: classic
-Constraints: windowsservercore-ltsc2022
-
-Tags: 26.1.4-cli, 26.1-cli, 26-cli, 26.1.4-cli-alpine3.20
-Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: fa327fa3796638b29faee017e8ebb30e94e4428f
-Directory: 26/cli
-
-Tags: 26.1.4-dind, 26.1-dind, 26-dind, 26.1.4-dind-alpine3.20, 26.1.4, 26.1, 26, 26.1.4-alpine3.20
-Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 12a00d721d4d84bd69ffd4a69f1f2851751ac2d9
-Directory: 26/dind
-
-Tags: 26.1.4-dind-rootless, 26.1-dind-rootless, 26-dind-rootless
-Architectures: amd64, arm64v8
-GitCommit: 6ce7fe78a5a66dadf37e9226d8485e94e894814f
-Directory: 26/dind-rootless
-
-Tags: 26.1.4-windowsservercore-1809, 26.1-windowsservercore-1809, 26-windowsservercore-1809
-SharedTags: 26.1.4-windowsservercore, 26.1-windowsservercore, 26-windowsservercore
-Architectures: windows-amd64
-GitCommit: fa327fa3796638b29faee017e8ebb30e94e4428f
-Directory: 26/windows/windowsservercore-1809
-Builder: classic
-Constraints: windowsservercore-1809
-
-Tags: 26.1.4-windowsservercore-ltsc2022, 26.1-windowsservercore-ltsc2022, 26-windowsservercore-ltsc2022
-SharedTags: 26.1.4-windowsservercore, 26.1-windowsservercore, 26-windowsservercore
-Architectures: windows-amd64
-GitCommit: fa327fa3796638b29faee017e8ebb30e94e4428f
-Directory: 26/windows/windowsservercore-ltsc2022
-Builder: classic
-Constraints: windowsservercore-ltsc2022
-
 Tags: 27.1.1-cli, 27.1-cli, 27-cli, cli, 27.1.1-cli-alpine3.20
 Architectures: amd64, arm32v6, arm32v7, arm64v8
 GitCommit: 7447127c9f8d3e7087d71f3b15aced8fd624ea39
diff --git a/_bashbrew-list b/_bashbrew-list
index 60f80ed..8928e12 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,81 +1,3 @@
-docker:24
-docker:24-cli
-docker:24-dind
-docker:24-dind-rootless
-docker:24-git
-docker:24-windowsservercore
-docker:24-windowsservercore-1809
-docker:24-windowsservercore-ltsc2022
-docker:24.0
-docker:24.0-cli
-docker:24.0-dind
-docker:24.0-dind-rootless
-docker:24.0-git
-docker:24.0-windowsservercore
-docker:24.0-windowsservercore-1809
-docker:24.0-windowsservercore-ltsc2022
-docker:24.0.9
-docker:24.0.9-alpine3.20
-docker:24.0.9-cli
-docker:24.0.9-cli-alpine3.20
-docker:24.0.9-dind
-docker:24.0.9-dind-alpine3.20
-docker:24.0.9-dind-rootless
-docker:24.0.9-git
-docker:24.0.9-windowsservercore
-docker:24.0.9-windowsservercore-1809
-docker:24.0.9-windowsservercore-ltsc2022
-docker:25
-docker:25-cli
-docker:25-dind
-docker:25-dind-rootless
-docker:25-git
-docker:25-windowsservercore
-docker:25-windowsservercore-1809
-docker:25-windowsservercore-ltsc2022
-docker:25.0
-docker:25.0-cli
-docker:25.0-dind
-docker:25.0-dind-rootless
-docker:25.0-git
-docker:25.0-windowsservercore
-docker:25.0-windowsservercore-1809
-docker:25.0-windowsservercore-ltsc2022
-docker:25.0.5
-docker:25.0.5-alpine3.20
-docker:25.0.5-cli
-docker:25.0.5-cli-alpine3.20
-docker:25.0.5-dind
-docker:25.0.5-dind-alpine3.20
-docker:25.0.5-dind-rootless
-docker:25.0.5-git
-docker:25.0.5-windowsservercore
-docker:25.0.5-windowsservercore-1809
-docker:25.0.5-windowsservercore-ltsc2022
-docker:26
-docker:26-cli
-docker:26-dind
-docker:26-dind-rootless
-docker:26-windowsservercore
-docker:26-windowsservercore-1809
-docker:26-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.4
-docker:26.1.4-alpine3.20
-docker:26.1.4-cli
-docker:26.1.4-cli-alpine3.20
-docker:26.1.4-dind
-docker:26.1.4-dind-alpine3.20
-docker:26.1.4-dind-rootless
-docker:26.1.4-windowsservercore
-docker:26.1.4-windowsservercore-1809
-docker:26.1.4-windowsservercore-ltsc2022
 docker:27
 docker:27-cli
 docker:27-dind
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 9049dde..3e655a5 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,20 +1,5 @@
-docker:24-windowsservercore-1809
-docker:24-windowsservercore-ltsc2022
-docker:24.0.9-cli-alpine3.20
-docker:25-windowsservercore-1809
-docker:25-windowsservercore-ltsc2022
-docker:25.0.5-cli-alpine3.20
-docker:26-windowsservercore-1809
-docker:26-windowsservercore-ltsc2022
-docker:26.1.4-cli-alpine3.20
 docker:27.1.1-cli-alpine3.20
 docker:windowsservercore-1809
 docker:windowsservercore-ltsc2022
-docker:24.0.9-alpine3.20
-docker:25.0.5-alpine3.20
-docker:26.1.4-alpine3.20
 docker:27.1.1-alpine3.20
 docker:dind-rootless
-docker:24-dind-rootless
-docker:25-dind-rootless
-docker:26-dind-rootless
diff --git a/docker_24-dind-rootless/Dockerfile b/docker_24-dind-rootless/Dockerfile
deleted file mode 100644
index e105f64..0000000
diff --git a/docker_24-windowsservercore-1809/Dockerfile b/docker_24-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 7870f77..0000000
diff --git a/docker_24-windowsservercore-ltsc2022/Dockerfile b/docker_24-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index 34d07b7..0000000
diff --git a/docker_24.0.9-alpine3.20/Dockerfile b/docker_24.0.9-alpine3.20/Dockerfile
deleted file mode 100644
index ab0aa3d..0000000
diff --git a/docker_24.0.9-alpine3.20/dockerd-entrypoint.sh b/docker_24.0.9-alpine3.20/dockerd-entrypoint.sh
deleted file mode 100755
index 6c06bb8..0000000
diff --git a/docker_24.0.9-cli-alpine3.20/Dockerfile b/docker_24.0.9-cli-alpine3.20/Dockerfile
deleted file mode 100644
index 2a74c87..0000000
diff --git a/docker_24.0.9-cli-alpine3.20/docker-entrypoint.sh b/docker_24.0.9-cli-alpine3.20/docker-entrypoint.sh
deleted file mode 100755
index d41cef8..0000000
diff --git a/docker_24.0.9-cli-alpine3.20/modprobe.sh b/docker_24.0.9-cli-alpine3.20/modprobe.sh
deleted file mode 100755
index b357d89..0000000
diff --git a/docker_25-dind-rootless/Dockerfile b/docker_25-dind-rootless/Dockerfile
deleted file mode 100644
index 7023e59..0000000
diff --git a/docker_25-windowsservercore-1809/Dockerfile b/docker_25-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 4f64019..0000000
diff --git a/docker_25-windowsservercore-ltsc2022/Dockerfile b/docker_25-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index b9ebef0..0000000
diff --git a/docker_25.0.5-alpine3.20/Dockerfile b/docker_25.0.5-alpine3.20/Dockerfile
deleted file mode 100644
index 4b83662..0000000
diff --git a/docker_25.0.5-alpine3.20/dockerd-entrypoint.sh b/docker_25.0.5-alpine3.20/dockerd-entrypoint.sh
deleted file mode 100755
index 6c06bb8..0000000
diff --git a/docker_25.0.5-cli-alpine3.20/Dockerfile b/docker_25.0.5-cli-alpine3.20/Dockerfile
deleted file mode 100644
index 978b892..0000000
diff --git a/docker_25.0.5-cli-alpine3.20/docker-entrypoint.sh b/docker_25.0.5-cli-alpine3.20/docker-entrypoint.sh
deleted file mode 100755
index d41cef8..0000000
diff --git a/docker_25.0.5-cli-alpine3.20/modprobe.sh b/docker_25.0.5-cli-alpine3.20/modprobe.sh
deleted file mode 100755
index b357d89..0000000
diff --git a/docker_26-dind-rootless/Dockerfile b/docker_26-dind-rootless/Dockerfile
deleted file mode 100644
index d176fdb..0000000
diff --git a/docker_26-windowsservercore-1809/Dockerfile b/docker_26-windowsservercore-1809/Dockerfile
deleted file mode 100644
index 01b3e5c..0000000
diff --git a/docker_26-windowsservercore-ltsc2022/Dockerfile b/docker_26-windowsservercore-ltsc2022/Dockerfile
deleted file mode 100644
index d9bd360..0000000
diff --git a/docker_26.1.4-alpine3.20/Dockerfile b/docker_26.1.4-alpine3.20/Dockerfile
deleted file mode 100644
index 7698d1e..0000000
diff --git a/docker_26.1.4-alpine3.20/dockerd-entrypoint.sh b/docker_26.1.4-alpine3.20/dockerd-entrypoint.sh
deleted file mode 100755
index 6c06bb8..0000000
diff --git a/docker_26.1.4-cli-alpine3.20/Dockerfile b/docker_26.1.4-cli-alpine3.20/Dockerfile
deleted file mode 100644
index 8b1ffe3..0000000
diff --git a/docker_26.1.4-cli-alpine3.20/docker-entrypoint.sh b/docker_26.1.4-cli-alpine3.20/docker-entrypoint.sh
deleted file mode 100755
index d41cef8..0000000
diff --git a/docker_26.1.4-cli-alpine3.20/modprobe.sh b/docker_26.1.4-cli-alpine3.20/modprobe.sh
deleted file mode 100755
index b357d89..0000000

Relevant Maintainers:

@yosifkit yosifkit merged commit 884f112 into docker-library:master Jul 31, 2024
7 of 8 checks passed
@yosifkit yosifkit deleted the docker branch July 31, 2024 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants