Skip to content

Commit bb8bcdd

Browse files
shahmishalshahmishal
committed
Update the URL for all of the old Dockerfiles
1 parent c35a070 commit bb8bcdd

File tree

40 files changed

+80
-81
lines changed

40 files changed

+80
-81
lines changed

‎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

‎5.1/ubuntu/16.04/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
1919
ARG SWIFT_PLATFORM=ubuntu16.04
2020
ARG SWIFT_BRANCH=swift-5.1.5-release
2121
ARG SWIFT_VERSION=swift-5.1.5-RELEASE
22-
ARG SWIFT_WEBROOT=https://download.swift.org/
22+
ARG SWIFT_WEBROOT=https://download.swift.org
2323

2424
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
2525
SWIFT_PLATFORM=$SWIFT_PLATFORM \
@@ -28,7 +28,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
2828
SWIFT_WEBROOT=$SWIFT_WEBROOT
2929

3030
RUN set -e; \
31-
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)/" \
31+
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)" \
3232
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz" \
3333
&& SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
3434
# - Grab curl here so we cache better up above

‎5.1/ubuntu/18.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=ubuntu18.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

‎5.1/ubuntu/18.04/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
1919
ARG SWIFT_PLATFORM=ubuntu18.04
2020
ARG SWIFT_BRANCH=swift-5.1.5-release
2121
ARG SWIFT_VERSION=swift-5.1.5-RELEASE
22-
ARG SWIFT_WEBROOT=https://download.swift.org/
22+
ARG SWIFT_WEBROOT=https://download.swift.org
2323

2424
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
2525
SWIFT_PLATFORM=$SWIFT_PLATFORM \
@@ -28,7 +28,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
2828
SWIFT_WEBROOT=$SWIFT_WEBROOT
2929

3030
RUN set -e; \
31-
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)/" \
31+
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)" \
3232
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz" \
3333
&& SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
3434
# - Grab curl and gpg here so we cache better up above

‎5.2/amazonlinux/2/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=amazonlinux2
3030
ARG SWIFT_BRANCH=swift-5.2.5-release
3131
ARG SWIFT_VERSION=swift-5.2.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
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.

‎5.2/amazonlinux/2/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
1111
ARG SWIFT_PLATFORM=amazonlinux2
1212
ARG SWIFT_BRANCH=swift-5.2.5-release
1313
ARG SWIFT_VERSION=swift-5.2.5-RELEASE
14-
ARG SWIFT_WEBROOT=https://download.swift.org/
14+
ARG SWIFT_WEBROOT=https://download.swift.org
1515

1616
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
1717
SWIFT_PLATFORM=$SWIFT_PLATFORM \
@@ -20,7 +20,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
2020
SWIFT_WEBROOT=$SWIFT_WEBROOT
2121

2222
RUN set -e; \
23-
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)/" \
23+
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)" \
2424
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz" \
2525
&& SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
2626
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.

‎5.2/centos/7/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
2828
ARG SWIFT_PLATFORM=centos7
2929
ARG SWIFT_BRANCH=swift-5.2.5-release
3030
ARG SWIFT_VERSION=swift-5.2.5-RELEASE
31-
ARG SWIFT_WEBROOT=https://download.swift.org/
31+
ARG SWIFT_WEBROOT=https://download.swift.org
3232

3333
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
3434
SWIFT_PLATFORM=$SWIFT_PLATFORM \
@@ -37,7 +37,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
3737
SWIFT_WEBROOT=$SWIFT_WEBROOT
3838

3939
RUN set -e; \
40-
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)/" \
40+
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)" \
4141
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz" \
4242
&& SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
4343
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.

‎5.2/centos/7/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
1111
ARG SWIFT_PLATFORM=centos7
1212
ARG SWIFT_BRANCH=swift-5.2.5-release
1313
ARG SWIFT_VERSION=swift-5.2.5-RELEASE
14-
ARG SWIFT_WEBROOT=https://download.swift.org/
14+
ARG SWIFT_WEBROOT=https://download.swift.org
1515

1616
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
1717
SWIFT_PLATFORM=$SWIFT_PLATFORM \
@@ -20,7 +20,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
2020
SWIFT_WEBROOT=$SWIFT_WEBROOT
2121

2222
RUN set -e; \
23-
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)/" \
23+
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)" \
2424
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz" \
2525
&& SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
2626
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.

‎5.2/centos/8/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
3030
ARG SWIFT_PLATFORM=centos8
3131
ARG SWIFT_BRANCH=swift-5.2.5-release
3232
ARG SWIFT_VERSION=swift-5.2.5-RELEASE
33-
ARG SWIFT_WEBROOT=https://download.swift.org/
33+
ARG SWIFT_WEBROOT=https://download.swift.org
3434

3535
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
3636
SWIFT_PLATFORM=$SWIFT_PLATFORM \
@@ -39,7 +39,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
3939
SWIFT_WEBROOT=$SWIFT_WEBROOT
4040

4141
RUN set -e; \
42-
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)/" \
42+
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)" \
4343
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz" \
4444
&& SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
4545
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.

‎5.2/centos/8/slim/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
1111
ARG SWIFT_PLATFORM=centos8
1212
ARG SWIFT_BRANCH=swift-5.2.5-release
1313
ARG SWIFT_VERSION=swift-5.2.5-RELEASE
14-
ARG SWIFT_WEBROOT=https://download.swift.org/
14+
ARG SWIFT_WEBROOT=https://download.swift.org
1515

1616
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
1717
SWIFT_PLATFORM=$SWIFT_PLATFORM \
@@ -20,7 +20,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
2020
SWIFT_WEBROOT=$SWIFT_WEBROOT
2121

2222
RUN set -e; \
23-
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)/" \
23+
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)" \
2424
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz" \
2525
&& SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
2626
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.

0 commit comments

Comments
 (0)