Skip to content

Commit 6ebea7b

Browse files
shahmishalshahmishal
authored
Merge pull request #256 from apple/swift-url-update
Update the URL for all of the old Dockerfiles
2 parents c35a070 + 63f5eb6 commit 6ebea7b

File tree

49 files changed

+104
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+104
-105
lines changed

‎3.1/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN SWIFT_URL=https://download.swift.org/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM"
5151
# uid Swift 4.x Release Signing Key <[email protected]>
5252
5E4DF843FB065D7F7E24FBA2EF5430F071E1B235 \
5353
; do \
54-
gpg --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
54+
gpg --quiet --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
5555
done \
5656
&& gpg --batch --verify --quiet swift.tar.gz.sig swift.tar.gz \
5757
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \

‎4.0/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN SWIFT_URL=https://download.swift.org/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM"
5151
# uid Swift 4.x Release Signing Key <[email protected]>
5252
5E4DF843FB065D7F7E24FBA2EF5430F071E1B235 \
5353
; do \
54-
gpg --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
54+
gpg --quiet --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
5555
done \
5656
&& gpg --batch --verify --quiet swift.tar.gz.sig swift.tar.gz \
5757
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \

‎4.1/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN SWIFT_URL=https://download.swift.org/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM"
5151
# uid Swift 4.x Release Signing Key <[email protected]>
5252
5E4DF843FB065D7F7E24FBA2EF5430F071E1B235 \
5353
; do \
54-
gpg --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
54+
gpg --quiet --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
5555
done \
5656
&& gpg --batch --verify --quiet swift.tar.gz.sig swift.tar.gz \
5757
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \

‎4.2/ubuntu/16.04/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN SWIFT_URL=https://download.swift.org/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM"
5252
# uid Swift 4.x Release Signing Key <[email protected]>
5353
5E4DF843FB065D7F7E24FBA2EF5430F071E1B235 \
5454
; do \
55-
gpg --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
55+
gpg --quiet --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
5656
done \
5757
&& gpg --batch --verify --quiet swift.tar.gz.sig swift.tar.gz \
5858
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \

‎4.2/ubuntu/18.04/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN SWIFT_URL=https://download.swift.org/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM"
5252
# uid Swift 4.x Release Signing Key <[email protected]>
5353
5E4DF843FB065D7F7E24FBA2EF5430F071E1B235 \
5454
; do \
55-
gpg --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
55+
gpg --quiet --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
5656
done \
5757
&& gpg --batch --verify --quiet swift.tar.gz.sig swift.tar.gz \
5858
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \

‎5.0/ubuntu/16.04/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN SWIFT_URL=https://download.swift.org/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM"
4646
# uid Swift 5.x Release Signing Key <[email protected]
4747
A62AE125BBBFBB96A6E042EC925CC1CCED3D1561 \
4848
; do \
49-
gpg --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
49+
gpg --quiet --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
5050
done \
5151
&& gpg --batch --verify --quiet swift.tar.gz.sig swift.tar.gz \
5252
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \

‎5.0/ubuntu/16.04/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN SWIFT_URL=https://download.swift.org/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM"
3434
# uid Swift 5.x Release Signing Key <[email protected]>
3535
A62AE125BBBFBB96A6E042EC925CC1CCED3D1561 \
3636
; do \
37-
gpg --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
37+
gpg --quiet --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
3838
done \
3939
&& gpg --batch --verify --quiet swift.tar.gz.sig swift.tar.gz \
4040
&& tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \

‎5.0/ubuntu/18.04/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ RUN SWIFT_URL=https://download.swift.org/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM"
4646
# uid Swift 5.x Release Signing Key <[email protected]
4747
A62AE125BBBFBB96A6E042EC925CC1CCED3D1561 \
4848
; do \
49-
gpg --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
49+
gpg --quiet --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
5050
done \
5151
&& gpg --batch --verify --quiet swift.tar.gz.sig swift.tar.gz \
5252
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \

‎5.0/ubuntu/18.04/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ RUN SWIFT_URL=https://download.swift.org/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM"
3434
# uid Swift 5.x Release Signing Key <[email protected]>
3535
A62AE125BBBFBB96A6E042EC925CC1CCED3D1561 \
3636
; do \
37-
gpg --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
37+
gpg --quiet --keyserver keyserver.ubuntu.com --recv-keys "$key"; \
3838
done \
3939
&& gpg --batch --verify --quiet swift.tar.gz.sig swift.tar.gz \
4040
&& tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \

‎5.1/ubuntu/16.04/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
2929
ARG SWIFT_PLATFORM=ubuntu16.04
3030
ARG SWIFT_BRANCH=swift-5.1.5-release
3131
ARG SWIFT_VERSION=swift-5.1.5-RELEASE
32-
ARG SWIFT_WEBROOT=https://download.swift.org/
32+
ARG SWIFT_WEBROOT=https://download.swift.org
3333

3434
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
3535
SWIFT_PLATFORM=$SWIFT_PLATFORM \
@@ -38,7 +38,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
3838
SWIFT_WEBROOT=$SWIFT_WEBROOT
3939

4040
RUN set -e; \
41-
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)/" \
41+
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)" \
4242
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz" \
4343
&& SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
4444
# - Grab curl here so we cache better up above

0 commit comments

Comments
 (0)