Skip to content

Commit 5582474

Browse files
committed
[Nightly] Update the nightly Dockerfiles to use swift.org for gpg key
1 parent b8dfc96 commit 5582474

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

nightly-5.2/ubuntu/16.04/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN set -e; \
5151
&& export GNUPGHOME="$(mktemp -d)" \
5252
&& curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
5353
${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \
54-
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
54+
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
5555
&& gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
5656
# - Unpack the toolchain, set libs permissions, and clean up.
5757
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \

nightly-5.2/ubuntu/16.04/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ RUN set -e; \
4242
&& export GNUPGHOME="$(mktemp -d)" \
4343
&& curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
4444
${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \
45-
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
45+
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
4646
&& gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
4747
# - Unpack the toolchain, set libs permissions, and clean up.
4848
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 ${DOWNLOAD_DIR}-${OS_VER}/usr/lib/swift/linux \

nightly-5.2/ubuntu/18.04/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN set -e; \
5151
&& export GNUPGHOME="$(mktemp -d)" \
5252
&& curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
5353
${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \
54-
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
54+
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
5555
&& gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
5656
# - Unpack the toolchain, set libs permissions, and clean up.
5757
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \

nightly-5.2/ubuntu/18.04/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ RUN set -e; \
4242
&& export GNUPGHOME="$(mktemp -d)" \
4343
&& curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
4444
${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \
45-
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
45+
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
4646
&& gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
4747
# - Unpack the toolchain, set libs permissions, and clean up.
4848
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 ${DOWNLOAD_DIR}-${OS_VER}/usr/lib/swift/linux \

nightly-master/ubuntu/16.04/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN set -e; \
5151
&& export GNUPGHOME="$(mktemp -d)" \
5252
&& curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
5353
${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \
54-
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
54+
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
5555
&& gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
5656
# - Unpack the toolchain, set libs permissions, and clean up.
5757
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \

nightly-master/ubuntu/16.04/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ RUN set -e; \
4242
&& export GNUPGHOME="$(mktemp -d)" \
4343
&& curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
4444
${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \
45-
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
45+
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
4646
&& gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
4747
# - Unpack the toolchain, set libs permissions, and clean up.
4848
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 ${DOWNLOAD_DIR}-${OS_VER}/usr/lib/swift/linux \

nightly-master/ubuntu/18.04/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN set -e; \
5151
&& export GNUPGHOME="$(mktemp -d)" \
5252
&& curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
5353
${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \
54-
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
54+
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
5555
&& gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
5656
# - Unpack the toolchain, set libs permissions, and clean up.
5757
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 \

nightly-master/ubuntu/18.04/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ RUN set -e; \
4242
&& export GNUPGHOME="$(mktemp -d)" \
4343
&& curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
4444
${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download_signature} -o latest_toolchain.tar.gz.sig \
45-
&& gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
45+
&& curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \
4646
&& gpg --batch --verify latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
4747
# - Unpack the toolchain, set libs permissions, and clean up.
4848
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 ${DOWNLOAD_DIR}-${OS_VER}/usr/lib/swift/linux \

0 commit comments

Comments
 (0)