Skip to content

Commit 6659885

Browse files
committed
[5.1] Update the Dockerfile to use swift-5.1-RELEASE packages
1 parent 552391d commit 6659885

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

5.1/ubuntu/16.04/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
2121

2222
# Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
2323

24-
# pub rsa4096 2017-11-07 [SC] [expires: 2019-11-07]
25-
# 8513 444E 2DA3 6B7C 1659 AF4D 7638 F1FB 2B2B 08C4
26-
# uid [ unknown] Swift Automatic Signing Key #2 <[email protected]>
27-
ARG SWIFT_SIGNING_KEY=8513444E2DA36B7C1659AF4D7638F1FB2B2B08C4
24+
# pub 4096R/ED3D1561 2019-03-22 [expires: 2021-03-21]
25+
# Key fingerprint = A62A E125 BBBF BB96 A6E0 42EC 925C C1CC ED3D 1561
26+
# uid Swift 5.x Release Signing Key <[email protected]
27+
ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
2828
ARG SWIFT_PLATFORM=ubuntu16.04
29-
ARG SWIFT_BRANCH=swift-5.1-branch
30-
ARG SWIFT_VERSION=swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-24-a
29+
ARG SWIFT_BRANCH=swift-5.1-release
30+
ARG SWIFT_VERSION=swift-5.1-RELEASE
3131
ARG SWIFT_WEBROOT=https://swift.org/builds/
3232

3333
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \

5.1/ubuntu/16.04/slim/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
1212

1313
# Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
1414

15-
# pub rsa4096 2017-11-07 [SC] [expires: 2019-11-07]
16-
# 8513 444E 2DA3 6B7C 1659 AF4D 7638 F1FB 2B2B 08C4
17-
# uid [ unknown] Swift Automatic Signing Key #2 <[email protected]>
18-
ARG SWIFT_SIGNING_KEY=8513444E2DA36B7C1659AF4D7638F1FB2B2B08C4
15+
# pub 4096R/ED3D1561 2019-03-22 [expires: 2021-03-21]
16+
# Key fingerprint = A62A E125 BBBF BB96 A6E0 42EC 925C C1CC ED3D 1561
17+
# uid Swift 5.x Release Signing Key <[email protected]
18+
ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
1919
ARG SWIFT_PLATFORM=ubuntu16.04
20-
ARG SWIFT_BRANCH=swift-5.1-branch
21-
ARG SWIFT_VERSION=swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-24-a
20+
ARG SWIFT_BRANCH=swift-5.1-release
21+
ARG SWIFT_VERSION=swift-5.1-RELEASE
2222
ARG SWIFT_WEBROOT=https://swift.org/builds/
2323

2424
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \

5.1/ubuntu/18.04/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
2121

2222
# Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
2323

24-
# pub rsa4096 2017-11-07 [SC] [expires: 2019-11-07]
25-
# 8513 444E 2DA3 6B7C 1659 AF4D 7638 F1FB 2B2B 08C4
26-
# uid [ unknown] Swift Automatic Signing Key #2 <[email protected]>
27-
ARG SWIFT_SIGNING_KEY=8513444E2DA36B7C1659AF4D7638F1FB2B2B08C4
24+
# pub 4096R/ED3D1561 2019-03-22 [expires: 2021-03-21]
25+
# Key fingerprint = A62A E125 BBBF BB96 A6E0 42EC 925C C1CC ED3D 1561
26+
# uid Swift 5.x Release Signing Key <[email protected]
27+
ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
2828
ARG SWIFT_PLATFORM=ubuntu18.04
29-
ARG SWIFT_BRANCH=swift-5.1-branch
30-
ARG SWIFT_VERSION=swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-24-a
29+
ARG SWIFT_BRANCH=swift-5.1-release
30+
ARG SWIFT_VERSION=swift-5.1-RELEASE
3131
ARG SWIFT_WEBROOT=https://swift.org/builds/
3232

3333
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \

5.1/ubuntu/18.04/slim/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
1212

1313
# Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
1414

15-
# pub rsa4096 2017-11-07 [SC] [expires: 2019-11-07]
16-
# 8513 444E 2DA3 6B7C 1659 AF4D 7638 F1FB 2B2B 08C4
17-
# uid [ unknown] Swift Automatic Signing Key #2 <[email protected]>
18-
ARG SWIFT_SIGNING_KEY=8513444E2DA36B7C1659AF4D7638F1FB2B2B08C4
15+
# pub 4096R/ED3D1561 2019-03-22 [expires: 2021-03-21]
16+
# Key fingerprint = A62A E125 BBBF BB96 A6E0 42EC 925C C1CC ED3D 1561
17+
# uid Swift 5.x Release Signing Key <[email protected]
18+
ARG SWIFT_SIGNING_KEY=A62AE125BBBFBB96A6E042EC925CC1CCED3D1561
1919
ARG SWIFT_PLATFORM=ubuntu18.04
20-
ARG SWIFT_BRANCH=swift-5.1-branch
21-
ARG SWIFT_VERSION=swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-24-a
20+
ARG SWIFT_BRANCH=swift-5.1-release
21+
ARG SWIFT_VERSION=swift-5.1-RELEASE
2222
ARG SWIFT_WEBROOT=https://swift.org/builds/
2323

2424
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \

0 commit comments

Comments
 (0)