Removed Swift variant of EOL Centos #17121
Merged
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
Diff for 0f006c2:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 98b066e..36595d4 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -10,14 +10,6 @@ Tags: 5.5.3-amazonlinux2-slim, 5.5-amazonlinux2-slim
GitCommit: 9394b31e064cf0d80eaab08b692a2886c7aea8fe
Directory: 5.5/amazonlinux/2/slim
-Tags: 5.5.3-centos7, 5.5-centos7
-GitCommit: 9394b31e064cf0d80eaab08b692a2886c7aea8fe
-Directory: 5.5/centos/7
-
-Tags: 5.5.3-centos7-slim, 5.5-centos7-slim
-GitCommit: 9394b31e064cf0d80eaab08b692a2886c7aea8fe
-Directory: 5.5/centos/7/slim
-
Tags: 5.5.3-focal, 5.5-focal
GitCommit: 9394b31e064cf0d80eaab08b692a2886c7aea8fe
Directory: 5.5/ubuntu/20.04
@@ -36,14 +28,6 @@ Architectures: amd64, arm64v8
GitCommit: 1188cc86d15f9e98d90db9f98de3598d5d5f7bb2
Directory: 5.6/amazonlinux/2/slim
-Tags: 5.6.3-centos7, 5.6-centos7
-GitCommit: 1188cc86d15f9e98d90db9f98de3598d5d5f7bb2
-Directory: 5.6/centos/7
-
-Tags: 5.6.3-centos7-slim, 5.6-centos7-slim
-GitCommit: 1188cc86d15f9e98d90db9f98de3598d5d5f7bb2
-Directory: 5.6/centos/7/slim
-
Tags: 5.6.3-focal, 5.6-focal
Architectures: amd64, arm64v8
GitCommit: 1188cc86d15f9e98d90db9f98de3598d5d5f7bb2
@@ -68,14 +52,6 @@ Tags: 5.7.3-amazonlinux2-slim, 5.7-amazonlinux2-slim
GitCommit: f53cb8e9f11507814412fb4e9c6f0fce1f4b7552
Directory: 5.7/amazonlinux/2/slim
-Tags: 5.7.3-centos7, 5.7-centos7
-GitCommit: f53cb8e9f11507814412fb4e9c6f0fce1f4b7552
-Directory: 5.7/centos/7
-
-Tags: 5.7.3-centos7-slim, 5.7-centos7-slim
-GitCommit: f53cb8e9f11507814412fb4e9c6f0fce1f4b7552
-Directory: 5.7/centos/7/slim
-
Tags: 5.7.3-focal, 5.7-focal
Architectures: amd64, arm64v8
GitCommit: f53cb8e9f11507814412fb4e9c6f0fce1f4b7552
@@ -106,14 +82,6 @@ Architectures: amd64, arm64v8
GitCommit: 0190ac8d812bfcfab0ee39d600116ab5e3243f48
Directory: 5.8/amazonlinux/2/slim
-Tags: 5.8.1-centos7, 5.8-centos7
-GitCommit: 0190ac8d812bfcfab0ee39d600116ab5e3243f48
-Directory: 5.8/centos/7
-
-Tags: 5.8.1-centos7-slim, 5.8-centos7-slim
-GitCommit: 0190ac8d812bfcfab0ee39d600116ab5e3243f48
-Directory: 5.8/centos/7/slim
-
Tags: 5.8.1-focal, 5.8-focal
Architectures: amd64, arm64v8
GitCommit: 0190ac8d812bfcfab0ee39d600116ab5e3243f48
@@ -154,14 +122,6 @@ Architectures: amd64, arm64v8
GitCommit: 51f0941d5f6d92af9df8aa89fa75841f5036c127
Directory: 5.9/amazonlinux/2/slim
-Tags: 5.9.2-centos7, 5.9-centos7
-GitCommit: 51f0941d5f6d92af9df8aa89fa75841f5036c127
-Directory: 5.9/centos/7
-
-Tags: 5.9.2-centos7-slim, 5.9-centos7-slim
-GitCommit: 51f0941d5f6d92af9df8aa89fa75841f5036c127
-Directory: 5.9/centos/7/slim
-
Tags: 5.9.2-focal, 5.9-focal
Architectures: amd64, arm64v8
GitCommit: 51f0941d5f6d92af9df8aa89fa75841f5036c127
@@ -213,14 +173,6 @@ Architectures: amd64, arm64v8
GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
Directory: 5.10/debian/12
-Tags: 5.10.1-centos7, 5.10-centos7, centos7
-GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
-Directory: 5.10/centos/7
-
-Tags: 5.10.1-centos7-slim, 5.10-centos7-slim, centos7-slim
-GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
-Directory: 5.10/centos/7/slim
-
Tags: 5.10.1-fedora39, 5.10-fedora39, fedora39
Architectures: amd64, arm64v8
GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
diff --git a/_bashbrew-list b/_bashbrew-list
index f954768..7e3873d 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,32 +1,22 @@
swift:5.5-amazonlinux2
swift:5.5-amazonlinux2-slim
-swift:5.5-centos7
-swift:5.5-centos7-slim
swift:5.5-focal
swift:5.5-focal-slim
swift:5.5.3-amazonlinux2
swift:5.5.3-amazonlinux2-slim
-swift:5.5.3-centos7
-swift:5.5.3-centos7-slim
swift:5.5.3-focal
swift:5.5.3-focal-slim
swift:5.6-amazonlinux2
swift:5.6-amazonlinux2-slim
-swift:5.6-centos7
-swift:5.6-centos7-slim
swift:5.6-focal
swift:5.6-focal-slim
swift:5.6.3-amazonlinux2
swift:5.6.3-amazonlinux2-slim
-swift:5.6.3-centos7
-swift:5.6.3-centos7-slim
swift:5.6.3-focal
swift:5.6.3-focal-slim
swift:5.7
swift:5.7-amazonlinux2
swift:5.7-amazonlinux2-slim
-swift:5.7-centos7
-swift:5.7-centos7-slim
swift:5.7-focal
swift:5.7-focal-slim
swift:5.7-jammy
@@ -35,8 +25,6 @@ swift:5.7-slim
swift:5.7.3
swift:5.7.3-amazonlinux2
swift:5.7.3-amazonlinux2-slim
-swift:5.7.3-centos7
-swift:5.7.3-centos7-slim
swift:5.7.3-focal
swift:5.7.3-focal-slim
swift:5.7.3-jammy
@@ -45,8 +33,6 @@ swift:5.7.3-slim
swift:5.8
swift:5.8-amazonlinux2
swift:5.8-amazonlinux2-slim
-swift:5.8-centos7
-swift:5.8-centos7-slim
swift:5.8-focal
swift:5.8-focal-slim
swift:5.8-jammy
@@ -57,8 +43,6 @@ swift:5.8-slim
swift:5.8.1
swift:5.8.1-amazonlinux2
swift:5.8.1-amazonlinux2-slim
-swift:5.8.1-centos7
-swift:5.8.1-centos7-slim
swift:5.8.1-focal
swift:5.8.1-focal-slim
swift:5.8.1-jammy
@@ -69,8 +53,6 @@ swift:5.8.1-slim
swift:5.9
swift:5.9-amazonlinux2
swift:5.9-amazonlinux2-slim
-swift:5.9-centos7
-swift:5.9-centos7-slim
swift:5.9-focal
swift:5.9-focal-slim
swift:5.9-jammy
@@ -82,8 +64,6 @@ swift:5.9-windowsservercore-ltsc2022
swift:5.9.2
swift:5.9.2-amazonlinux2
swift:5.9.2-amazonlinux2-slim
-swift:5.9.2-centos7
-swift:5.9.2-centos7-slim
swift:5.9.2-focal
swift:5.9.2-focal-slim
swift:5.9.2-jammy
@@ -96,8 +76,6 @@ swift:5.10
swift:5.10-amazonlinux2
swift:5.10-amazonlinux2-slim
swift:5.10-bookworm
-swift:5.10-centos7
-swift:5.10-centos7-slim
swift:5.10-fedora39
swift:5.10-focal
swift:5.10-focal-slim
@@ -113,8 +91,6 @@ swift:5.10.1
swift:5.10.1-amazonlinux2
swift:5.10.1-amazonlinux2-slim
swift:5.10.1-bookworm
-swift:5.10.1-centos7
-swift:5.10.1-centos7-slim
swift:5.10.1-fedora39
swift:5.10.1-focal
swift:5.10.1-focal-slim
@@ -129,8 +105,6 @@ swift:5.10.1-windowsservercore-ltsc2022
swift:amazonlinux2
swift:amazonlinux2-slim
swift:bookworm
-swift:centos7
-swift:centos7-slim
swift:fedora39
swift:focal
swift:focal-slim
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 62a695d..3f8d29a 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,27 +1,19 @@
swift:5.5-amazonlinux2
swift:5.5-amazonlinux2-slim
-swift:5.5-centos7
-swift:5.5-centos7-slim
swift:5.5-focal
swift:5.5-focal-slim
swift:5.6-amazonlinux2
swift:5.6-amazonlinux2-slim
-swift:5.6-centos7
-swift:5.6-centos7-slim
swift:5.6-focal
swift:5.6-focal-slim
swift:5.7-amazonlinux2
swift:5.7-amazonlinux2-slim
-swift:5.7-centos7
-swift:5.7-centos7-slim
swift:5.7-focal
swift:5.7-focal-slim
swift:5.7-jammy
swift:5.7-jammy-slim
swift:5.8-amazonlinux2
swift:5.8-amazonlinux2-slim
-swift:5.8-centos7
-swift:5.8-centos7-slim
swift:5.8-focal
swift:5.8-focal-slim
swift:5.8-jammy
@@ -30,8 +22,6 @@ swift:5.8-rhel-ubi9
swift:5.8-rhel-ubi9-slim
swift:5.9-amazonlinux2
swift:5.9-amazonlinux2-slim
-swift:5.9-centos7
-swift:5.9-centos7-slim
swift:5.9-focal
swift:5.9-focal-slim
swift:5.9-jammy
@@ -42,8 +32,6 @@ swift:5.9-windowsservercore-ltsc2022
swift:amazonlinux2
swift:amazonlinux2-slim
swift:bookworm
-swift:centos7
-swift:centos7-slim
swift:fedora39
swift:focal
swift:focal-slim
diff --git a/swift_5.5-centos7-slim/Dockerfile b/swift_5.5-centos7-slim/Dockerfile
deleted file mode 100644
index 2eba3e6..0000000
diff --git a/swift_5.5-centos7/Dockerfile b/swift_5.5-centos7/Dockerfile
deleted file mode 100644
index b66c0f0..0000000
diff --git a/swift_5.6-centos7-slim/Dockerfile b/swift_5.6-centos7-slim/Dockerfile
deleted file mode 100644
index 2d147fe..0000000
diff --git a/swift_5.6-centos7/Dockerfile b/swift_5.6-centos7/Dockerfile
deleted file mode 100644
index f225a9a..0000000
diff --git a/swift_5.7-centos7-slim/Dockerfile b/swift_5.7-centos7-slim/Dockerfile
deleted file mode 100644
index a73171b..0000000
diff --git a/swift_5.7-centos7/Dockerfile b/swift_5.7-centos7/Dockerfile
deleted file mode 100644
index 30fd9e1..0000000
diff --git a/swift_5.8-centos7-slim/Dockerfile b/swift_5.8-centos7-slim/Dockerfile
deleted file mode 100644
index 98c9c89..0000000
diff --git a/swift_5.8-centos7/Dockerfile b/swift_5.8-centos7/Dockerfile
deleted file mode 100644
index b257d8c..0000000
diff --git a/swift_5.9-centos7-slim/Dockerfile b/swift_5.9-centos7-slim/Dockerfile
deleted file mode 100644
index 2f00c1e..0000000
diff --git a/swift_5.9-centos7/Dockerfile b/swift_5.9-centos7/Dockerfile
deleted file mode 100644
index fa71a66..0000000
diff --git a/swift_centos7-slim/Dockerfile b/swift_centos7-slim/Dockerfile
deleted file mode 100644
index 9ec1c34..0000000
diff --git a/swift_centos7/Dockerfile b/swift_centos7/Dockerfile
deleted file mode 100644
index 2e9021e..0000000Relevant Maintainers:
|
|
Since CentOS 7 is end of life, we'd like to drop the CentOS variants of the |
yosifkit
approved these changes
Jul 19, 2024
|
Going ahead with removing the end-of-life centos-based swift images. We're slowly migrating images to our newer build system and don't want to repush these EOL images. |
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.
This is in response to #17094 (comment), in order to drop CentOS-based Swift images since the CentOS 7 image has been dropped from Docker Official Images.