Skip to content

Commit a237eeb

Browse files
shahmishalshahmishal
authored
Merge pull request #248 from apple/update-the-keyserver
Update the 5.4 Dockerfile to use keyserver.ubuntu.com for offical Doc…
2 parents 18aa0f2 + 1dc7c29 commit a237eeb

File tree

12 files changed

+12
-12
lines changed

12 files changed

+12
-12
lines changed

‎5.4/amazonlinux/2/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN set -e; \
4444
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
4545
&& export GNUPGHOME="$(mktemp -d)" \
4646
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
47-
&& curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
47+
&& gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
4848
&& gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
4949
# - Unpack the toolchain, set libs permissions, and clean up.
5050
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \

‎5.4/amazonlinux/2/slim/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN set -e; \
2626
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
2727
&& export GNUPGHOME="$(mktemp -d)" \
2828
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
29-
&& curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
29+
&& gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
3030
&& gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
3131
# - Unpack the toolchain, set libs permissions, and clean up.
3232
&& yum -y install tar gzip \

‎5.4/centos/7/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN set -e; \
4343
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
4444
&& export GNUPGHOME="$(mktemp -d)" \
4545
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
46-
&& curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
46+
&& gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
4747
&& gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
4848
# - Unpack the toolchain, set libs permissions, and clean up.
4949
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \

‎5.4/centos/7/slim/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN set -e; \
2626
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
2727
&& export GNUPGHOME="$(mktemp -d)" \
2828
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
29-
&& curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
29+
&& gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
3030
&& gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
3131
# - Unpack the toolchain, set libs permissions, and clean up.
3232
&& tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \

‎5.4/centos/8/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN set -e; \
4545
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
4646
&& export GNUPGHOME="$(mktemp -d)" \
4747
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
48-
&& curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
48+
&& gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
4949
&& gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
5050
# - Unpack the toolchain, set libs permissions, and clean up.
5151
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \

‎5.4/centos/8/slim/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN set -e; \
2626
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
2727
&& export GNUPGHOME="$(mktemp -d)" \
2828
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
29-
&& curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
29+
&& gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
3030
&& gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
3131
# - Unpack the toolchain, set libs permissions, and clean up.
3232
&& tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \

‎5.4/ubuntu/16.04/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ RUN set -e; \
4747
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
4848
&& export GNUPGHOME="$(mktemp -d)" \
4949
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
50-
&& curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
50+
&& gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
5151
&& gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
5252
# - Unpack the toolchain, set libs permissions, and clean up.
5353
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \

‎5.4/ubuntu/16.04/slim/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN set -e; \
3737
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
3838
&& export GNUPGHOME="$(mktemp -d)" \
3939
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
40-
&& curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
40+
&& gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
4141
&& gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
4242
# - Unpack the toolchain, set libs permissions, and clean up.
4343
&& tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \

‎5.4/ubuntu/18.04/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ RUN set -e; \
4747
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
4848
&& export GNUPGHOME="$(mktemp -d)" \
4949
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
50-
&& curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
50+
&& gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
5151
&& gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
5252
# - Unpack the toolchain, set libs permissions, and clean up.
5353
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \

‎5.4/ubuntu/18.04/slim/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN set -e; \
3737
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
3838
&& export GNUPGHOME="$(mktemp -d)" \
3939
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
40-
&& curl -fSsL https://swift.org/keys/release-key-swift-5.x.asc | gpg --import - \
40+
&& gpg --batch --quiet --keyserver keyserver.ubuntu.com --recv-keys "$SWIFT_SIGNING_KEY" \
4141
&& gpg --batch --verify swift.tar.gz.sig swift.tar.gz \
4242
# - Unpack the toolchain, set libs permissions, and clean up.
4343
&& tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \

0 commit comments

Comments
 (0)