From 091006ff78fc1f5758c4a02cfe066eb9a07e1838 Mon Sep 17 00:00:00 2001 From: Andrew Sukach Date: Tue, 22 Apr 2025 14:11:40 -0700 Subject: [PATCH] Add `--compressed` for nightly-6.1 --- nightly-6.1/amazonlinux/2/Dockerfile | 2 +- nightly-6.1/amazonlinux/2/buildx/Dockerfile | 2 +- nightly-6.1/amazonlinux/2/slim/Dockerfile | 3 +-- nightly-6.1/debian/12/Dockerfile | 2 +- nightly-6.1/debian/12/buildx/Dockerfile | 2 +- nightly-6.1/fedora/39/Dockerfile | 4 ++-- nightly-6.1/fedora/39/buildx/Dockerfile | 4 ++-- nightly-6.1/rhel-ubi/9/Dockerfile | 2 +- nightly-6.1/rhel-ubi/9/buildx/Dockerfile | 2 +- nightly-6.1/rhel-ubi/9/slim/Dockerfile | 2 +- nightly-6.1/ubuntu/20.04/Dockerfile | 2 +- nightly-6.1/ubuntu/20.04/buildx/Dockerfile | 2 +- nightly-6.1/ubuntu/20.04/slim/Dockerfile | 2 +- nightly-6.1/ubuntu/22.04/Dockerfile | 2 +- nightly-6.1/ubuntu/22.04/buildx/Dockerfile | 2 +- nightly-6.1/ubuntu/22.04/slim/Dockerfile | 2 +- nightly-6.1/ubuntu/24.04/Dockerfile | 2 +- nightly-6.1/ubuntu/24.04/buildx/Dockerfile | 2 +- nightly-6.1/ubuntu/24.04/slim/Dockerfile | 2 +- 19 files changed, 21 insertions(+), 22 deletions(-) diff --git a/nightly-6.1/amazonlinux/2/Dockerfile b/nightly-6.1/amazonlinux/2/Dockerfile index 643ca06d..7e12833a 100644 --- a/nightly-6.1/amazonlinux/2/Dockerfile +++ b/nightly-6.1/amazonlinux/2/Dockerfile @@ -53,7 +53,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \ # - Unpack the toolchain, set libs permissions, and clean up. && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \ diff --git a/nightly-6.1/amazonlinux/2/buildx/Dockerfile b/nightly-6.1/amazonlinux/2/buildx/Dockerfile index 4960e3b1..5aa8ff07 100644 --- a/nightly-6.1/amazonlinux/2/buildx/Dockerfile +++ b/nightly-6.1/amazonlinux/2/buildx/Dockerfile @@ -59,7 +59,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${PLATFORM_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${PLATFORM_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \ # - Unpack the toolchain, set libs permissions, and clean up. && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \ diff --git a/nightly-6.1/amazonlinux/2/slim/Dockerfile b/nightly-6.1/amazonlinux/2/slim/Dockerfile index 809edd24..900b34d9 100644 --- a/nightly-6.1/amazonlinux/2/slim/Dockerfile +++ b/nightly-6.1/amazonlinux/2/slim/Dockerfile @@ -3,7 +3,6 @@ LABEL maintainer="Swift Infrastructure " LABEL description="Docker Container for the Swift programming language" # Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little - # gpg --keyid-format LONG -k F167DF1ACF9CE069 # pub rsa4096/F167DF1ACF9CE069 2021-11-08 [SC] [expires: 2025-11-09] # E813C892820A6FA13755B268F167DF1ACF9CE069 @@ -31,7 +30,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \ # - Unpack the toolchain, set libs permissions, and clean up. && yum -y install tar gzip \ diff --git a/nightly-6.1/debian/12/Dockerfile b/nightly-6.1/debian/12/Dockerfile index e242cdf0..ed7da96c 100644 --- a/nightly-6.1/debian/12/Dockerfile +++ b/nightly-6.1/debian/12/Dockerfile @@ -56,7 +56,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ # - Unpack the toolchain, set libs permissions, and clean up. && mkdir -p $SWIFT_PREFIX \ && tar -xzf latest_toolchain.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \ diff --git a/nightly-6.1/debian/12/buildx/Dockerfile b/nightly-6.1/debian/12/buildx/Dockerfile index 7487753c..eb994748 100644 --- a/nightly-6.1/debian/12/buildx/Dockerfile +++ b/nightly-6.1/debian/12/buildx/Dockerfile @@ -66,7 +66,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ # - Unpack the toolchain, set libs permissions, and clean up. && mkdir -p $SWIFT_PREFIX \ && tar -xzf latest_toolchain.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \ diff --git a/nightly-6.1/fedora/39/Dockerfile b/nightly-6.1/fedora/39/Dockerfile index 0cc950fa..bf9b451d 100644 --- a/nightly-6.1/fedora/39/Dockerfile +++ b/nightly-6.1/fedora/39/Dockerfile @@ -58,7 +58,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ # - Unpack the toolchain, set libs permissions, and clean up. && mkdir -p $SWIFT_PREFIX \ && tar -xzf latest_toolchain.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \ @@ -72,4 +72,4 @@ USER build-user WORKDIR /home/build-user # Print Installed Swift Version -RUN swift --version \ No newline at end of file +RUN swift --version diff --git a/nightly-6.1/fedora/39/buildx/Dockerfile b/nightly-6.1/fedora/39/buildx/Dockerfile index 6d9b4407..0346612b 100644 --- a/nightly-6.1/fedora/39/buildx/Dockerfile +++ b/nightly-6.1/fedora/39/buildx/Dockerfile @@ -68,7 +68,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ # - Unpack the toolchain, set libs permissions, and clean up. && mkdir -p $SWIFT_PREFIX \ && tar -xzf latest_toolchain.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \ @@ -82,4 +82,4 @@ USER build-user WORKDIR /home/build-user # Print Installed Swift Version -RUN swift --version \ No newline at end of file +RUN swift --version diff --git a/nightly-6.1/rhel-ubi/9/Dockerfile b/nightly-6.1/rhel-ubi/9/Dockerfile index 0ecba0b0..85889f16 100644 --- a/nightly-6.1/rhel-ubi/9/Dockerfile +++ b/nightly-6.1/rhel-ubi/9/Dockerfile @@ -46,7 +46,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \ - && curl -fL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \ # - Unpack the toolchain, set libs permissions, and clean up. && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \ diff --git a/nightly-6.1/rhel-ubi/9/buildx/Dockerfile b/nightly-6.1/rhel-ubi/9/buildx/Dockerfile index ee7324ba..b8d9df30 100644 --- a/nightly-6.1/rhel-ubi/9/buildx/Dockerfile +++ b/nightly-6.1/rhel-ubi/9/buildx/Dockerfile @@ -52,7 +52,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${PLATFORM_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${PLATFORM_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \ # - Unpack the toolchain, set libs permissions, and clean up. && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \ diff --git a/nightly-6.1/rhel-ubi/9/slim/Dockerfile b/nightly-6.1/rhel-ubi/9/slim/Dockerfile index d23dd9b7..549626f2 100644 --- a/nightly-6.1/rhel-ubi/9/slim/Dockerfile +++ b/nightly-6.1/rhel-ubi/9/slim/Dockerfile @@ -31,7 +31,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \ # - Unpack the toolchain, set libs permissions, and clean up. && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \ diff --git a/nightly-6.1/ubuntu/20.04/Dockerfile b/nightly-6.1/ubuntu/20.04/Dockerfile index bd41e150..c597ff17 100644 --- a/nightly-6.1/ubuntu/20.04/Dockerfile +++ b/nightly-6.1/ubuntu/20.04/Dockerfile @@ -56,7 +56,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \ # - Unpack the toolchain, set libs permissions, and clean up. && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \ diff --git a/nightly-6.1/ubuntu/20.04/buildx/Dockerfile b/nightly-6.1/ubuntu/20.04/buildx/Dockerfile index cb923826..9ec56662 100644 --- a/nightly-6.1/ubuntu/20.04/buildx/Dockerfile +++ b/nightly-6.1/ubuntu/20.04/buildx/Dockerfile @@ -62,7 +62,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${PLATFORM_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${PLATFORM_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \ # - Unpack the toolchain, set libs permissions, and clean up. && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \ diff --git a/nightly-6.1/ubuntu/20.04/slim/Dockerfile b/nightly-6.1/ubuntu/20.04/slim/Dockerfile index 3d4d6824..8b77994c 100644 --- a/nightly-6.1/ubuntu/20.04/slim/Dockerfile +++ b/nightly-6.1/ubuntu/20.04/slim/Dockerfile @@ -41,7 +41,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \ # - Unpack the toolchain, set libs permissions, and clean up. && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \ diff --git a/nightly-6.1/ubuntu/22.04/Dockerfile b/nightly-6.1/ubuntu/22.04/Dockerfile index 3b01f3d5..f08c736e 100644 --- a/nightly-6.1/ubuntu/22.04/Dockerfile +++ b/nightly-6.1/ubuntu/22.04/Dockerfile @@ -56,7 +56,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \ # - Unpack the toolchain, set libs permissions, and clean up. && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \ diff --git a/nightly-6.1/ubuntu/22.04/buildx/Dockerfile b/nightly-6.1/ubuntu/22.04/buildx/Dockerfile index 3b7547d7..a3205144 100644 --- a/nightly-6.1/ubuntu/22.04/buildx/Dockerfile +++ b/nightly-6.1/ubuntu/22.04/buildx/Dockerfile @@ -62,7 +62,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${PLATFORM_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${PLATFORM_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \ # - Unpack the toolchain, set libs permissions, and clean up. && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \ diff --git a/nightly-6.1/ubuntu/22.04/slim/Dockerfile b/nightly-6.1/ubuntu/22.04/slim/Dockerfile index 2ac17cfc..ca02acfd 100644 --- a/nightly-6.1/ubuntu/22.04/slim/Dockerfile +++ b/nightly-6.1/ubuntu/22.04/slim/Dockerfile @@ -41,7 +41,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \ # - Unpack the toolchain, set libs permissions, and clean up. && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \ diff --git a/nightly-6.1/ubuntu/24.04/Dockerfile b/nightly-6.1/ubuntu/24.04/Dockerfile index df0f2de9..c81cfa18 100644 --- a/nightly-6.1/ubuntu/24.04/Dockerfile +++ b/nightly-6.1/ubuntu/24.04/Dockerfile @@ -53,7 +53,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \ # - Unpack the toolchain, set libs permissions, and clean up. && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \ diff --git a/nightly-6.1/ubuntu/24.04/buildx/Dockerfile b/nightly-6.1/ubuntu/24.04/buildx/Dockerfile index 9e3190c0..f874ef90 100644 --- a/nightly-6.1/ubuntu/24.04/buildx/Dockerfile +++ b/nightly-6.1/ubuntu/24.04/buildx/Dockerfile @@ -59,7 +59,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${PLATFORM_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${PLATFORM_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \ # - Unpack the toolchain, set libs permissions, and clean up. && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \ diff --git a/nightly-6.1/ubuntu/24.04/slim/Dockerfile b/nightly-6.1/ubuntu/24.04/slim/Dockerfile index ebbc99bf..453b4d8b 100644 --- a/nightly-6.1/ubuntu/24.04/slim/Dockerfile +++ b/nightly-6.1/ubuntu/24.04/slim/Dockerfile @@ -42,7 +42,7 @@ RUN set -e; \ && export GNUPGHOME="$(mktemp -d)" \ && curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \ ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ + && curl -fSsL --compressed https://swift.org/keys/all-keys.asc | gpg --import - \ && gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \ # - Unpack the toolchain, set libs permissions, and clean up. && tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \