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.

Sign up for GitHub

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

Jump to bottom

[Swift] Release Swift 6.0 Docker images #17571

Merged
merged 2 commits into from
Sep 17, 2024
Merged

[Swift] Release Swift 6.0 Docker images #17571

merged 2 commits into from
Sep 17, 2024

Conversation

shahmishal
Copy link
Contributor

No description provided.

@shahmishal shahmishal requested a review from a team as a code owner September 17, 2024 01:00
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@github-actions GitHub Actions
Copy link

Diff for 8f77ce3: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 36595d4..a715e0e 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -153,68 +153,129 @@ GitCommit: 51f0941d5f6d92af9df8aa89fa75841f5036c127
 Directory: 5.9/windows/LTSC2022
 Constraints: windowsservercore-ltsc2022
 
-Tags: 5.10.1, 5.10, 5.10.1-jammy, 5.10-jammy, jammy, latest
+Tags: 5.10.1, 5.10, 5.10.1-jammy, 5.10-jammy
 Architectures: amd64, arm64v8
 GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
 Directory: 5.10/ubuntu/22.04
 
-Tags: 5.10.1-amazonlinux2, 5.10-amazonlinux2, amazonlinux2
+Tags: 5.10.1-amazonlinux2, 5.10-amazonlinux2
 Architectures: amd64, arm64v8
 GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
 Directory: 5.10/amazonlinux/2
 
-Tags: 5.10.1-amazonlinux2-slim, 5.10-amazonlinux2-slim, amazonlinux2-slim
+Tags: 5.10.1-amazonlinux2-slim, 5.10-amazonlinux2-slim
 Architectures: amd64, arm64v8
 GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
 Directory: 5.10/amazonlinux/2/slim
 
-Tags: 5.10.1-bookworm, 5.10-bookworm, bookworm
+Tags: 5.10.1-bookworm, 5.10-bookworm
 Architectures: amd64, arm64v8
 GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
 Directory: 5.10/debian/12
 
-Tags: 5.10.1-fedora39, 5.10-fedora39, fedora39
+Tags: 5.10.1-fedora39, 5.10-fedora39
 Architectures: amd64, arm64v8
 GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
 Directory: 5.10/fedora/39
 
-Tags: 5.10.1-focal, 5.10-focal, focal
+Tags: 5.10.1-focal, 5.10-focal
 Architectures: amd64, arm64v8
 GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
 Directory: 5.10/ubuntu/20.04
 
-Tags: 5.10.1-focal-slim, 5.10-focal-slim, focal-slim
+Tags: 5.10.1-focal-slim, 5.10-focal-slim
 Architectures: amd64, arm64v8
 GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
 Directory: 5.10/ubuntu/20.04/slim
 
-Tags: 5.10.1-mantic, 5.10-mantic, mantic
-Architectures: amd64, arm64v8
-GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
-Directory: 5.10/ubuntu/23.10
-
-Tags: 5.10.1-noble, 5.10-noble, noble
+Tags: 5.10.1-noble, 5.10-noble
 Architectures: amd64, arm64v8
 GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
 Directory: 5.10/ubuntu/24.04
 
-Tags: 5.10.1-rhel-ubi9, 5.10-rhel-ubi9, rhel-ubi9
+Tags: 5.10.1-rhel-ubi9, 5.10-rhel-ubi9
 Architectures: amd64, arm64v8
 GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
 Directory: 5.10/rhel-ubi/9
 
-Tags: 5.10.1-rhel-ubi9-slim, 5.10-rhel-ubi9-slim, rhel-ubi9-slim
+Tags: 5.10.1-rhel-ubi9-slim, 5.10-rhel-ubi9-slim
 Architectures: amd64, arm64v8
 GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
 Directory: 5.10/rhel-ubi/9/slim
 
-Tags: 5.10.1-slim, 5.10-slim, 5.10.1-jammy-slim, 5.10-jammy-slim, jammy-slim, slim
+Tags: 5.10.1-slim, 5.10-slim, 5.10.1-jammy-slim, 5.10-jammy-slim
 Architectures: amd64, arm64v8
 GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
 Directory: 5.10/ubuntu/22.04/slim
 
-Tags: 5.10.1-windowsservercore-ltsc2022, 5.10-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+Tags: 5.10.1-windowsservercore-ltsc2022, 5.10-windowsservercore-ltsc2022
 Architectures: windows-amd64
 GitCommit: 53c4d44e4b556d7bab6ff94c80e5bd0444cdc17d
 Directory: 5.10/windows/LTSC2022
 Constraints: windowsservercore-ltsc2022
+
+Tags: 6.0.0, 6.0, 6.0.0-noble, 6.0-noble, noble, latest
+Architectures: amd64, arm64v8
+GitCommit: cd8fc32f82bf1c96173fd7a0b018e94fbcbbe74b
+Directory: 6.0/ubuntu/24.04
+
+Tags: 6.0.0-amazonlinux2, 6.0-amazonlinux2, amazonlinux2
+Architectures: amd64, arm64v8
+GitCommit: cd8fc32f82bf1c96173fd7a0b018e94fbcbbe74b
+Directory: 6.0/amazonlinux/2
+
+Tags: 6.0.0-amazonlinux2-slim, 6.0-amazonlinux2-slim, amazonlinux2-slim
+Architectures: amd64, arm64v8
+GitCommit: cd8fc32f82bf1c96173fd7a0b018e94fbcbbe74b
+Directory: 6.0/amazonlinux/2/slim
+
+Tags: 6.0.0-bookworm, 6.0-bookworm, bookworm
+Architectures: amd64, arm64v8
+GitCommit: cd8fc32f82bf1c96173fd7a0b018e94fbcbbe74b
+Directory: 6.0/debian/12
+
+Tags: 6.0.0-fedora39, 6.0-fedora39, fedora39
+Architectures: amd64, arm64v8
+GitCommit: cd8fc32f82bf1c96173fd7a0b018e94fbcbbe74b
+Directory: 6.0/fedora/39
+
+Tags: 6.0.0-focal, 6.0-focal, focal
+Architectures: amd64, arm64v8
+GitCommit: cd8fc32f82bf1c96173fd7a0b018e94fbcbbe74b
+Directory: 6.0/ubuntu/20.04
+
+Tags: 6.0.0-focal-slim, 6.0-focal-slim, focal-slim
+Architectures: amd64, arm64v8
+GitCommit: cd8fc32f82bf1c96173fd7a0b018e94fbcbbe74b
+Directory: 6.0/ubuntu/20.04/slim
+
+Tags: 6.0.0-jammy, 6.0-jammy, jammy
+Architectures: amd64, arm64v8
+GitCommit: cd8fc32f82bf1c96173fd7a0b018e94fbcbbe74b
+Directory: 6.0/ubuntu/22.04
+
+Tags: 6.0.0-jammy-slim, 6.0-jammy-slim, jammy-slim
+Architectures: amd64, arm64v8
+GitCommit: cd8fc32f82bf1c96173fd7a0b018e94fbcbbe74b
+Directory: 6.0/ubuntu/22.04/slim
+
+Tags: 6.0.0-rhel-ubi9, 6.0-rhel-ubi9, rhel-ubi9
+Architectures: amd64, arm64v8
+GitCommit: cd8fc32f82bf1c96173fd7a0b018e94fbcbbe74b
+Directory: 6.0/rhel-ubi/9
+
+Tags: 6.0.0-rhel-ubi9-slim, 6.0-rhel-ubi9-slim, rhel-ubi9-slim
+Architectures: amd64, arm64v8
+GitCommit: cd8fc32f82bf1c96173fd7a0b018e94fbcbbe74b
+Directory: 6.0/rhel-ubi/9/slim
+
+Tags: 6.0.0-slim, 6.0-slim, 6.0.0-noble-slim, 6.0-noble-slim, noble-slim, slim
+Architectures: amd64, arm64v8
+GitCommit: cd8fc32f82bf1c96173fd7a0b018e94fbcbbe74b
+Directory: 6.0/ubuntu/24.04/slim
+
+Tags: 6.0.0-windowsservercore-ltsc2022, 6.0-windowsservercore-ltsc2022, windowsservercore-ltsc2022
+Architectures: windows-amd64
+GitCommit: cd8fc32f82bf1c96173fd7a0b018e94fbcbbe74b
+Directory: 6.0/windows/LTSC2022
+Constraints: windowsservercore-ltsc2022
diff --git a/_bashbrew-list b/_bashbrew-list
index 7e3873d..f7c68cd 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -81,7 +81,6 @@ swift:5.10-focal
 swift:5.10-focal-slim
 swift:5.10-jammy
 swift:5.10-jammy-slim
-swift:5.10-mantic
 swift:5.10-noble
 swift:5.10-rhel-ubi9
 swift:5.10-rhel-ubi9-slim
@@ -96,12 +95,41 @@ swift:5.10.1-focal
 swift:5.10.1-focal-slim
 swift:5.10.1-jammy
 swift:5.10.1-jammy-slim
-swift:5.10.1-mantic
 swift:5.10.1-noble
 swift:5.10.1-rhel-ubi9
 swift:5.10.1-rhel-ubi9-slim
 swift:5.10.1-slim
 swift:5.10.1-windowsservercore-ltsc2022
+swift:6.0
+swift:6.0-amazonlinux2
+swift:6.0-amazonlinux2-slim
+swift:6.0-bookworm
+swift:6.0-fedora39
+swift:6.0-focal
+swift:6.0-focal-slim
+swift:6.0-jammy
+swift:6.0-jammy-slim
+swift:6.0-noble
+swift:6.0-noble-slim
+swift:6.0-rhel-ubi9
+swift:6.0-rhel-ubi9-slim
+swift:6.0-slim
+swift:6.0-windowsservercore-ltsc2022
+swift:6.0.0
+swift:6.0.0-amazonlinux2
+swift:6.0.0-amazonlinux2-slim
+swift:6.0.0-bookworm
+swift:6.0.0-fedora39
+swift:6.0.0-focal
+swift:6.0.0-focal-slim
+swift:6.0.0-jammy
+swift:6.0.0-jammy-slim
+swift:6.0.0-noble
+swift:6.0.0-noble-slim
+swift:6.0.0-rhel-ubi9
+swift:6.0.0-rhel-ubi9-slim
+swift:6.0.0-slim
+swift:6.0.0-windowsservercore-ltsc2022
 swift:amazonlinux2
 swift:amazonlinux2-slim
 swift:bookworm
@@ -111,8 +139,8 @@ swift:focal-slim
 swift:jammy
 swift:jammy-slim
 swift:latest
-swift:mantic
 swift:noble
+swift:noble-slim
 swift:rhel-ubi9
 swift:rhel-ubi9-slim
 swift:slim
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 3f8d29a..4dfd85d 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -29,15 +29,27 @@ swift:5.9-jammy-slim
 swift:5.9-rhel-ubi9
 swift:5.9-rhel-ubi9-slim
 swift:5.9-windowsservercore-ltsc2022
+swift:5.10-amazonlinux2
+swift:5.10-amazonlinux2-slim
+swift:5.10-bookworm
+swift:5.10-fedora39
+swift:5.10-focal
+swift:5.10-focal-slim
+swift:5.10-jammy
+swift:5.10-jammy-slim
+swift:5.10-noble
+swift:5.10-rhel-ubi9
+swift:5.10-rhel-ubi9-slim
+swift:5.10-windowsservercore-ltsc2022
 swift:amazonlinux2
 swift:amazonlinux2-slim
 swift:bookworm
 swift:fedora39
 swift:focal
 swift:focal-slim
+swift:jammy
+swift:jammy-slim
 swift:latest
-swift:mantic
-swift:noble
 swift:rhel-ubi9
 swift:rhel-ubi9-slim
 swift:slim
diff --git a/swift_amazonlinux2-slim/Dockerfile b/swift_5.10-amazonlinux2-slim/Dockerfile
similarity index 100%
copy from swift_amazonlinux2-slim/Dockerfile
copy to swift_5.10-amazonlinux2-slim/Dockerfile
diff --git a/swift_amazonlinux2/Dockerfile b/swift_5.10-amazonlinux2/Dockerfile
similarity index 100%
copy from swift_amazonlinux2/Dockerfile
copy to swift_5.10-amazonlinux2/Dockerfile
diff --git a/swift_bookworm/Dockerfile b/swift_5.10-bookworm/Dockerfile
similarity index 100%
copy from swift_bookworm/Dockerfile
copy to swift_5.10-bookworm/Dockerfile
diff --git a/swift_fedora39/Dockerfile b/swift_5.10-fedora39/Dockerfile
similarity index 100%
copy from swift_fedora39/Dockerfile
copy to swift_5.10-fedora39/Dockerfile
diff --git a/swift_focal-slim/Dockerfile b/swift_5.10-focal-slim/Dockerfile
similarity index 100%
copy from swift_focal-slim/Dockerfile
copy to swift_5.10-focal-slim/Dockerfile
diff --git a/swift_focal/Dockerfile b/swift_5.10-focal/Dockerfile
similarity index 100%
copy from swift_focal/Dockerfile
copy to swift_5.10-focal/Dockerfile
diff --git a/swift_slim/Dockerfile b/swift_5.10-jammy-slim/Dockerfile
similarity index 100%
copy from swift_slim/Dockerfile
copy to swift_5.10-jammy-slim/Dockerfile
diff --git a/swift_latest/Dockerfile b/swift_5.10-jammy/Dockerfile
similarity index 100%
copy from swift_latest/Dockerfile
copy to swift_5.10-jammy/Dockerfile
diff --git a/swift_noble/Dockerfile b/swift_5.10-noble/Dockerfile
similarity index 100%
rename from swift_noble/Dockerfile
rename to swift_5.10-noble/Dockerfile
diff --git a/swift_rhel-ubi9-slim/Dockerfile b/swift_5.10-rhel-ubi9-slim/Dockerfile
similarity index 100%
copy from swift_rhel-ubi9-slim/Dockerfile
copy to swift_5.10-rhel-ubi9-slim/Dockerfile
diff --git a/swift_rhel-ubi9/Dockerfile b/swift_5.10-rhel-ubi9/Dockerfile
similarity index 100%
copy from swift_rhel-ubi9/Dockerfile
copy to swift_5.10-rhel-ubi9/Dockerfile
diff --git a/swift_windowsservercore-ltsc2022/Dockerfile b/swift_5.10-windowsservercore-ltsc2022/Dockerfile
similarity index 100%
copy from swift_windowsservercore-ltsc2022/Dockerfile
copy to swift_5.10-windowsservercore-ltsc2022/Dockerfile
diff --git a/swift_amazonlinux2-slim/Dockerfile b/swift_amazonlinux2-slim/Dockerfile
index 70c5671..4d25a56 100644
--- a/swift_amazonlinux2-slim/Dockerfile
+++ b/swift_amazonlinux2-slim/Dockerfile
@@ -4,13 +4,13 @@ LABEL description="Docker Container for the Swift programming language"
 
 # Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
 
-# pub   4096R/ED3D1561 2019-03-22 [SC] [expires: 2023-03-23]
-#       Key fingerprint = A62A E125 BBBF BB96 A6E0  42EC 925C C1CC ED3D 1561
-# uid                  Swift 5.x Release Signing Key <[email protected]
-ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
+# pub   rsa4096 2024-09-16 [SC] [expires: 2026-09-16]
+#      52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
+# uid           [ unknown] Swift 6.x Release Signing Key <[email protected]>
+ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
 ARG SWIFT_PLATFORM=amazonlinux2
-ARG SWIFT_BRANCH=swift-5.10.1-release
-ARG SWIFT_VERSION=swift-5.10.1-RELEASE
+ARG SWIFT_BRANCH=swift-6.0-release
+ARG SWIFT_VERSION=swift-6.0-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_amazonlinux2/Dockerfile b/swift_amazonlinux2/Dockerfile
index 08ba280..78e2f2d 100644
--- a/swift_amazonlinux2/Dockerfile
+++ b/swift_amazonlinux2/Dockerfile
@@ -24,13 +24,13 @@ RUN yum -y install \
 
 # Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
 
-# pub   4096R/ED3D1561 2019-03-22 [SC] [expires: 2023-03-23]
-#       Key fingerprint = A62A E125 BBBF BB96 A6E0  42EC 925C C1CC ED3D 1561
-# uid                  Swift 5.x Release Signing Key <[email protected]
-ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
+# pub   rsa4096 2024-09-16 [SC] [expires: 2026-09-16]
+#      52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
+# uid           [ unknown] Swift 6.x Release Signing Key <[email protected]>
+ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
 ARG SWIFT_PLATFORM=amazonlinux2
-ARG SWIFT_BRANCH=swift-5.10.1-release
-ARG SWIFT_VERSION=swift-5.10.1-RELEASE
+ARG SWIFT_BRANCH=swift-6.0-release
+ARG SWIFT_VERSION=swift-6.0-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_bookworm/Dockerfile b/swift_bookworm/Dockerfile
index 9dab342..cb7a13d 100644
--- a/swift_bookworm/Dockerfile
+++ b/swift_bookworm/Dockerfile
@@ -22,13 +22,13 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
 
 # Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
 
-# pub   4096R/ED3D1561 2019-03-22 [SC] [expires: 2023-03-23]
-#       Key fingerprint = A62A E125 BBBF BB96 A6E0  42EC 925C C1CC ED3D 1561
-# uid                  Swift 5.x Release Signing Key <[email protected]
-ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
+# pub   rsa4096 2024-09-16 [SC] [expires: 2026-09-16]
+#      52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
+# uid           [ unknown] Swift 6.x Release Signing Key <[email protected]>
+ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
 ARG SWIFT_PLATFORM=debian12
-ARG SWIFT_BRANCH=swift-5.10.1-release
-ARG SWIFT_VERSION=swift-5.10.1-RELEASE
+ARG SWIFT_BRANCH=swift-6.0-release
+ARG SWIFT_VERSION=swift-6.0-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_fedora39/Dockerfile b/swift_fedora39/Dockerfile
index 90a5e19..25e8234 100644
--- a/swift_fedora39/Dockerfile
+++ b/swift_fedora39/Dockerfile
@@ -18,13 +18,13 @@ RUN yum -y install \
 
 # Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
 
-# pub   4096R/ED3D1561 2019-03-22 [SC] [expires: 2023-03-23]
-#       Key fingerprint = A62A E125 BBBF BB96 A6E0  42EC 925C C1CC ED3D 1561
-# uid                  Swift 5.x Release Signing Key <[email protected]
-ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
+# pub   rsa4096 2024-09-16 [SC] [expires: 2026-09-16]
+#      52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
+# uid           [ unknown] Swift 6.x Release Signing Key <[email protected]>
+ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
 ARG SWIFT_PLATFORM=fedora39
-ARG SWIFT_BRANCH=swift-5.10.1-release
-ARG SWIFT_VERSION=swift-5.10.1-RELEASE
+ARG SWIFT_BRANCH=swift-6.0-release
+ARG SWIFT_VERSION=swift-6.0-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_focal-slim/Dockerfile b/swift_focal-slim/Dockerfile
index dafccd5..17a63e8 100644
--- a/swift_focal-slim/Dockerfile
+++ b/swift_focal-slim/Dockerfile
@@ -11,13 +11,13 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
 
 # Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
 
-# pub   4096R/ED3D1561 2019-03-22 [SC] [expires: 2023-03-23]
-#       Key fingerprint = A62A E125 BBBF BB96 A6E0  42EC 925C C1CC ED3D 1561
-# uid                  Swift 5.x Release Signing Key <[email protected]
-ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
+# pub   rsa4096 2024-09-16 [SC] [expires: 2026-09-16]
+#      52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
+# uid           [ unknown] Swift 6.x Release Signing Key <[email protected]>
+ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
 ARG SWIFT_PLATFORM=ubuntu20.04
-ARG SWIFT_BRANCH=swift-5.10.1-release
-ARG SWIFT_VERSION=swift-5.10.1-RELEASE
+ARG SWIFT_BRANCH=swift-6.0-release
+ARG SWIFT_VERSION=swift-6.0-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_focal/Dockerfile b/swift_focal/Dockerfile
index 4eb9ea2..8932e9c 100644
--- a/swift_focal/Dockerfile
+++ b/swift_focal/Dockerfile
@@ -24,13 +24,13 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
 
 # Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
 
-# pub   4096R/ED3D1561 2019-03-22 [SC] [expires: 2023-03-23]
-#       Key fingerprint = A62A E125 BBBF BB96 A6E0  42EC 925C C1CC ED3D 1561
-# uid                  Swift 5.x Release Signing Key <[email protected]
-ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
+# pub   rsa4096 2024-09-16 [SC] [expires: 2026-09-16]
+#      52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
+# uid           [ unknown] Swift 6.x Release Signing Key <[email protected]>
+ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
 ARG SWIFT_PLATFORM=ubuntu20.04
-ARG SWIFT_BRANCH=swift-5.10.1-release
-ARG SWIFT_VERSION=swift-5.10.1-RELEASE
+ARG SWIFT_BRANCH=swift-6.0-release
+ARG SWIFT_VERSION=swift-6.0-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_5.9-jammy-slim/Dockerfile b/swift_jammy-slim/Dockerfile
similarity index 86%
copy from swift_5.9-jammy-slim/Dockerfile
copy to swift_jammy-slim/Dockerfile
index 8004b4e..eea17fd 100644
--- a/swift_5.9-jammy-slim/Dockerfile
+++ b/swift_jammy-slim/Dockerfile
@@ -11,13 +11,13 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
 
 # Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
 
-# pub   4096R/ED3D1561 2019-03-22 [SC] [expires: 2023-03-23]
-#       Key fingerprint = A62A E125 BBBF BB96 A6E0  42EC 925C C1CC ED3D 1561
-# uid                  Swift 5.x Release Signing Key <[email protected]
-ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
+# pub   rsa4096 2024-09-16 [SC] [expires: 2026-09-16]
+#      52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
+# uid           [ unknown] Swift 6.x Release Signing Key <[email protected]>
+ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
 ARG SWIFT_PLATFORM=ubuntu22.04
-ARG SWIFT_BRANCH=swift-5.9.2-release
-ARG SWIFT_VERSION=swift-5.9.2-RELEASE
+ARG SWIFT_BRANCH=swift-6.0-release
+ARG SWIFT_VERSION=swift-6.0-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_mantic/Dockerfile b/swift_jammy/Dockerfile
similarity index 85%
rename from swift_mantic/Dockerfile
rename to swift_jammy/Dockerfile
index b25f161..0b2e24d 100644
--- a/swift_mantic/Dockerfile
+++ b/swift_jammy/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:23.10
+FROM ubuntu:22.04
 LABEL maintainer="Swift Infrastructure <[email protected]>"
 LABEL description="Docker Container for the Swift programming language"
 
@@ -25,13 +25,13 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
 
 # Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
 
-# pub   4096R/ED3D1561 2019-03-22 [SC] [expires: 2023-03-23]
-#       Key fingerprint = A62A E125 BBBF BB96 A6E0  42EC 925C C1CC ED3D 1561
-# uid                  Swift 5.x Release Signing Key <[email protected]
-ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
-ARG SWIFT_PLATFORM=ubuntu23.10
-ARG SWIFT_BRANCH=swift-5.10.1-release
-ARG SWIFT_VERSION=swift-5.10.1-RELEASE
+# pub   rsa4096 2024-09-16 [SC] [expires: 2026-09-16]
+#      52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
+# uid           [ unknown] Swift 6.x Release Signing Key <[email protected]>
+ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
+ARG SWIFT_PLATFORM=ubuntu22.04
+ARG SWIFT_BRANCH=swift-6.0-release
+ARG SWIFT_VERSION=swift-6.0-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_latest/Dockerfile b/swift_latest/Dockerfile
index 5470e3c..2a79752 100644
--- a/swift_latest/Dockerfile
+++ b/swift_latest/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 LABEL maintainer="Swift Infrastructure <[email protected]>"
 LABEL description="Docker Container for the Swift programming language"
 
@@ -11,27 +11,27 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
     libc6-dev \
     libcurl4-openssl-dev \
     libedit2 \
-    libgcc-11-dev \
+    libgcc-13-dev \
     libpython3-dev \
     libsqlite3-0 \
-    libstdc++-11-dev \
+    libstdc++-13-dev \
     libxml2-dev \
+    libncurses-dev \
     libz3-dev \
     pkg-config \
-    python3-lldb-13 \
     tzdata \
     zlib1g-dev \
     && rm -r /var/lib/apt/lists/*
 
 # Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
 
-# pub   4096R/ED3D1561 2019-03-22 [SC] [expires: 2023-03-23]
-#       Key fingerprint = A62A E125 BBBF BB96 A6E0  42EC 925C C1CC ED3D 1561
-# uid                  Swift 5.x Release Signing Key <[email protected]
-ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
-ARG SWIFT_PLATFORM=ubuntu22.04
-ARG SWIFT_BRANCH=swift-5.10.1-release
-ARG SWIFT_VERSION=swift-5.10.1-RELEASE
+# pub   rsa4096 2024-09-16 [SC] [expires: 2026-09-16]
+#      52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
+# uid           [ unknown] Swift 6.x Release Signing Key <[email protected]>
+ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
+ARG SWIFT_PLATFORM=ubuntu24.04
+ARG SWIFT_BRANCH=swift-6.0-release
+ARG SWIFT_VERSION=swift-6.0-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_rhel-ubi9-slim/Dockerfile b/swift_rhel-ubi9-slim/Dockerfile
index 1465844..6778052 100644
--- a/swift_rhel-ubi9-slim/Dockerfile
+++ b/swift_rhel-ubi9-slim/Dockerfile
@@ -4,13 +4,13 @@ LABEL description="Docker Container for the Swift programming language"
 
 # Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
 
-# pub   4096R/ED3D1561 2019-03-22 [SC] [expires: 2023-03-23]
-#       Key fingerprint = A62A E125 BBBF BB96 A6E0  42EC 925C C1CC ED3D 1561
-# uid                  Swift 5.x Release Signing Key <[email protected]
-ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
+# pub   rsa4096 2024-09-16 [SC] [expires: 2026-09-16]
+#      52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
+# uid           [ unknown] Swift 6.x Release Signing Key <[email protected]>
+ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
 ARG SWIFT_PLATFORM=ubi9
-ARG SWIFT_BRANCH=swift-5.10.1-release
-ARG SWIFT_VERSION=swift-5.10.1-RELEASE
+ARG SWIFT_BRANCH=swift-6.0-release
+ARG SWIFT_VERSION=swift-6.0-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_rhel-ubi9/Dockerfile b/swift_rhel-ubi9/Dockerfile
index 7d532c3..1b20c75 100644
--- a/swift_rhel-ubi9/Dockerfile
+++ b/swift_rhel-ubi9/Dockerfile
@@ -18,13 +18,13 @@ RUN yum -y install \
 
 # Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
 
-# pub   4096R/ED3D1561 2019-03-22 [SC] [expires: 2023-03-23]
-#       Key fingerprint = A62A E125 BBBF BB96 A6E0  42EC 925C C1CC ED3D 1561
-# uid                  Swift 5.x Release Signing Key <[email protected]
-ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
+# pub   rsa4096 2024-09-16 [SC] [expires: 2026-09-16]
+#      52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
+# uid           [ unknown] Swift 6.x Release Signing Key <[email protected]>
+ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
 ARG SWIFT_PLATFORM=ubi9
-ARG SWIFT_BRANCH=swift-5.10.1-release
-ARG SWIFT_VERSION=swift-5.10.1-RELEASE
+ARG SWIFT_BRANCH=swift-6.0-release
+ARG SWIFT_VERSION=swift-6.0-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_slim/Dockerfile b/swift_slim/Dockerfile
index 385a762..c3c7fb1 100644
--- a/swift_slim/Dockerfile
+++ b/swift_slim/Dockerfile
@@ -1,4 +1,5 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
+
 LABEL maintainer="Swift Infrastructure <[email protected]>"
 LABEL description="Docker Container for the Swift programming language"
 
@@ -11,13 +12,13 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
 
 # Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
 
-# pub   4096R/ED3D1561 2019-03-22 [SC] [expires: 2023-03-23]
-#       Key fingerprint = A62A E125 BBBF BB96 A6E0  42EC 925C C1CC ED3D 1561
-# uid                  Swift 5.x Release Signing Key <[email protected]
-ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
-ARG SWIFT_PLATFORM=ubuntu22.04
-ARG SWIFT_BRANCH=swift-5.10.1-release
-ARG SWIFT_VERSION=swift-5.10.1-RELEASE
+# pub   rsa4096 2024-09-16 [SC] [expires: 2026-09-16]
+#      52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
+# uid           [ unknown] Swift 6.x Release Signing Key <[email protected]>
+ARG SWIFT_SIGNING_KEY=52BB7E3DE28A71BE22EC05FFEF80A866B47A981F
+ARG SWIFT_PLATFORM=ubuntu24.04
+ARG SWIFT_BRANCH=swift-6.0-release
+ARG SWIFT_VERSION=swift-6.0-RELEASE
 ARG SWIFT_WEBROOT=https://download.swift.org
 
 ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
diff --git a/swift_windowsservercore-ltsc2022/Dockerfile b/swift_windowsservercore-ltsc2022/Dockerfile
index ba19947..aed3f05 100644
--- a/swift_windowsservercore-ltsc2022/Dockerfile
+++ b/swift_windowsservercore-ltsc2022/Dockerfile
@@ -121,8 +121,8 @@ RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:VSB});
     Remove-Item -ErrorAction SilentlyContinue -Force -Recurse ${env:TEMP}\*
 
 # Install Swift toolchain.
-ARG SWIFT=https://download.swift.org/swift-5.10.1-release/windows10/swift-5.10.1-RELEASE/swift-5.10.1-RELEASE-windows10.exe
-ARG SWIFT_SHA256=3027762138ACFA1BBE3050FF6613BBE754332E84C9EFA5C23984646009297286
+ARG SWIFT=https://download.swift.org/swift-6.0-release/windows10/swift-6.0-RELEASE/swift-6.0-RELEASE-windows10.exe
+ARG SWIFT_SHA256=0C6807B674B01B961DF87CD0DBE18D1ACDE93DC9A124DDE453BD6B597C1DB456
 RUN Write-Host -NoNewLine ('Downloading {0} ... ' -f ${env:SWIFT});             \
     Invoke-WebRequest -Uri ${env:SWIFT} -OutFile installer.exe;                 \
     Write-Host '✓';                                                             \

Relevant Maintainers:

@shahmishal shahmishal mentioned this pull request Sep 17, 2024
Merged
tianon
tianon approved these changes Sep 17, 2024
View reviewed changes
Copy link
Member

@tianon tianon left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The number of supported versions is getting long again (5.5, 5.6, 5.7, 5.8, 5.9, 5.10, and now 6.0) -- are any of those versions end-of-life? 👀

As a reminder, removing tags here will remove them from the "Supported" section on the Hub readme (and will prevent us from spending cycles rebuilding them on the official build servers), but the tags will still be available to users who want them. (See https://github.com/docker-library/official-images#library-definition-files for more detail on this.)

@tianon tianon merged commit c060144 into docker-library:master Sep 17, 2024
61 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tianon tianon tianon approved these changes

Assignees
No one assigned
Labels
library/swift
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@shahmishal @tianon