Skip to content

Commit 337041a

Browse files
gwynnegwynne
committed
Update the 16.04, 16.04-slim and 18.04-slim Dockerfiles to match the changes to 18.04
1 parent 86dc3fb commit 337041a

File tree

3 files changed

+81
-81
lines changed

3 files changed

+81
-81
lines changed

‎5.1/ubuntu/16.04/Dockerfile

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM ubuntu:16.04
22
LABEL maintainer="Swift Infrastructure <[email protected]>"
33
LABEL Description="Docker Container for the Swift programming language"
44

5-
RUN apt-get -q update && \
5+
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
66
apt-get -q install -y \
77
libatomic1 \
88
libcurl3 \
@@ -17,40 +17,40 @@ RUN apt-get -q update && \
1717
tzdata \
1818
git \
1919
pkg-config \
20-
&& rm -r /var/lib/apt/lists/*
20+
curl \
21+
&& rm -r /var/lib/apt/lists/*
2122

2223
# Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
24+
25+
# pub rsa4096 2017-11-07 [SC] [expires: 2019-11-07]
26+
# 8513 444E 2DA3 6B7C 1659 AF4D 7638 F1FB 2B2B 08C4
27+
# uid [ unknown] Swift Automatic Signing Key #2 <[email protected]>
28+
ARG SWIFT_SIGNING_KEY=8513444E2DA36B7C1659AF4D7638F1FB2B2B08C4
2329
ARG SWIFT_PLATFORM=ubuntu16.04
2430
ARG SWIFT_BRANCH=swift-5.1-branch
25-
ARG SWIFT_VERSION=swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-21-a
31+
ARG SWIFT_VERSION=swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-24-a
32+
ARG SWIFT_WEBROOT=https://swift.org/builds/
2633

27-
ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \
34+
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
35+
SWIFT_PLATFORM=$SWIFT_PLATFORM \
2836
SWIFT_BRANCH=$SWIFT_BRANCH \
29-
SWIFT_VERSION=$SWIFT_VERSION
37+
SWIFT_VERSION=$SWIFT_VERSION \
38+
SWIFT_WEBROOT=$SWIFT_WEBROOT
3039

31-
# Download GPG keys, signature and Swift package, then unpack, cleanup and execute permissions for foundation libs
32-
RUN SWIFT_URL=https://swift.org/builds/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM" | tr -d .)/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz \
33-
&& apt-get -q update \
34-
&& apt-get -q install -y curl \
35-
&& curl -fSsL $SWIFT_URL -o swift.tar.gz \
36-
# && curl -fSsL $SWIFT_URL.sig -o swift.tar.gz.sig \
37-
&& apt-get purge -y curl \
38-
&& apt-get -y autoremove \
39-
# && export GNUPGHOME="$(mktemp -d)" \
40-
# && set -e; \
41-
# for key in \
42-
# # pub 4096R/ED3D1561 2019-03-22 [expires: 2021-03-21]
43-
# # Key fingerprint = A62A E125 BBBF BB96 A6E0 42EC 925C C1CC ED3D 1561
44-
# # uid Swift 5.x Release Signing Key <[email protected]
45-
# A62AE125BBBFBB96A6E042EC925CC1CCED3D1561 \
46-
# ; do \
47-
# gpg --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
48-
# done \
49-
# && gpg --batch --verify --quiet swift.tar.gz.sig swift.tar.gz \
40+
RUN set -e; \
41+
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)/" \
42+
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz" \
43+
&& SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
44+
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
45+
&& export GNUPGHOME="$(mktemp -d)" \
46+
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
47+
&& gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
48+
&& gpg --batch --quiet --verify swift.tar.gz.sig swift.tar.gz \
49+
# - Unpack the toolchain, set libs permissions, and clean up.
5050
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \
51-
# && rm -r "$GNUPGHOME" swift.tar.gz.sig \
52-
&& rm swift.tar.gz \
53-
&& chmod -R o+r /usr/lib/swift
51+
&& chmod -R o+r /usr/lib/swift \
52+
&& rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \
53+
&& apt-get purge --auto-remove -y curl
5454

5555
# Print Installed Swift Version
5656
RUN swift --version

‎5.1/ubuntu/16.04/slim/Dockerfile

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,38 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
88
libcurl3 \
99
libxml2 \
1010
tzdata \
11+
curl \
12+
gpg \
1113
&& rm -r /var/lib/apt/lists/*
1214

1315
# Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
16+
17+
# pub rsa4096 2017-11-07 [SC] [expires: 2019-11-07]
18+
# 8513 444E 2DA3 6B7C 1659 AF4D 7638 F1FB 2B2B 08C4
19+
# uid [ unknown] Swift Automatic Signing Key #2 <[email protected]>
20+
ARG SWIFT_SIGNING_KEY=8513444E2DA36B7C1659AF4D7638F1FB2B2B08C4
1421
ARG SWIFT_PLATFORM=ubuntu16.04
1522
ARG SWIFT_BRANCH=swift-5.1-branch
16-
ARG SWIFT_VERSION=swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-21-a
23+
ARG SWIFT_VERSION=swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-24-a
24+
ARG SWIFT_WEBROOT=https://swift.org/builds/
1725

18-
ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \
26+
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
27+
SWIFT_PLATFORM=$SWIFT_PLATFORM \
1928
SWIFT_BRANCH=$SWIFT_BRANCH \
20-
SWIFT_VERSION=$SWIFT_VERSION
29+
SWIFT_VERSION=$SWIFT_VERSION \
30+
SWIFT_WEBROOT=$SWIFT_WEBROOT
2131

22-
# Download GPG keys, signature and Swift package, then unpack, cleanup and execute permissions for foundation libs
23-
RUN SWIFT_URL=https://swift.org/builds/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM" | tr -d .)/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz \
24-
&& apt-get update \
25-
&& apt-get install -y curl \
26-
&& curl -fSsL $SWIFT_URL -o swift.tar.gz \
27-
# && curl -fSsL $SWIFT_URL.sig -o swift.tar.gz.sig \
28-
# && export GNUPGHOME="$(mktemp -d)" \
29-
# && set -e; \
30-
# for key in \
31-
# # pub 4096R/ED3D1561 2019-03-22 [expires: 2021-03-21]
32-
# # Key fingerprint = A62A E125 BBBF BB96 A6E0 42EC 925C C1CC ED3D 1561
33-
# # uid Swift 5.x Release Signing Key <[email protected]>
34-
# A62AE125BBBFBB96A6E042EC925CC1CCED3D1561 \
35-
# ; do \
36-
# gpg --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
37-
# done \
38-
# && gpg --batch --verify --quiet swift.tar.gz.sig swift.tar.gz \
39-
&& tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \
40-
&& apt-get purge -y curl \
41-
&& apt-get -y autoremove \
42-
&& rm -r /var/lib/apt/lists/* \
43-
# && rm -r "$GNUPGHOME" swift.tar.gz.sig \
44-
&& rm swift.tar.gz \
45-
&& chmod -R o+r /usr/lib/swift
32+
RUN set -e; \
33+
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)/" \
34+
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz" \
35+
&& SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
36+
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
37+
&& export GNUPGHOME="$(mktemp -d)" \
38+
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
39+
&& gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
40+
&& gpg --batch --quiet --verify swift.tar.gz.sig swift.tar.gz \
41+
# - Unpack the toolchain, set libs permissions, and clean up.
42+
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \
43+
&& chmod -R o+r /usr/lib/swift \
44+
&& rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \
45+
&& apt-get purge --auto-remove -y curl gpg

‎5.1/ubuntu/18.04/slim/Dockerfile

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,38 +8,38 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap
88
libcurl4 \
99
libxml2 \
1010
tzdata \
11+
curl \
12+
gpg \
1113
&& rm -r /var/lib/apt/lists/*
1214

1315
# Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little
16+
17+
# pub rsa4096 2017-11-07 [SC] [expires: 2019-11-07]
18+
# 8513 444E 2DA3 6B7C 1659 AF4D 7638 F1FB 2B2B 08C4
19+
# uid [ unknown] Swift Automatic Signing Key #2 <[email protected]>
20+
ARG SWIFT_SIGNING_KEY=8513444E2DA36B7C1659AF4D7638F1FB2B2B08C4
1421
ARG SWIFT_PLATFORM=ubuntu18.04
1522
ARG SWIFT_BRANCH=swift-5.1-branch
16-
ARG SWIFT_VERSION=swift-5.1-DEVELOPMENT-SNAPSHOT-2019-06-21-a
23+
ARG SWIFT_VERSION=swift-5.1-DEVELOPMENT-SNAPSHOT-2019-08-24-a
24+
ARG SWIFT_WEBROOT=https://swift.org/builds/
1725

18-
ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \
26+
ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \
27+
SWIFT_PLATFORM=$SWIFT_PLATFORM \
1928
SWIFT_BRANCH=$SWIFT_BRANCH \
20-
SWIFT_VERSION=$SWIFT_VERSION
29+
SWIFT_VERSION=$SWIFT_VERSION \
30+
SWIFT_WEBROOT=$SWIFT_WEBROOT
2131

22-
# Download GPG keys, signature and Swift package, then unpack, cleanup and execute permissions for foundation libs
23-
RUN SWIFT_URL=https://swift.org/builds/$SWIFT_BRANCH/$(echo "$SWIFT_PLATFORM" | tr -d .)/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz \
24-
&& apt-get update \
25-
&& apt-get install -y curl gpg \
26-
&& curl -fSsL $SWIFT_URL -o swift.tar.gz \
27-
# && curl -fSsL $SWIFT_URL.sig -o swift.tar.gz.sig \
28-
# && export GNUPGHOME="$(mktemp -d)" \
29-
# && set -e; \
30-
# for key in \
31-
# # pub 4096R/ED3D1561 2019-03-22 [expires: 2021-03-21]
32-
# # Key fingerprint = A62A E125 BBBF BB96 A6E0 42EC 925C C1CC ED3D 1561
33-
# # uid Swift 5.x Release Signing Key <[email protected]>
34-
# A62AE125BBBFBB96A6E042EC925CC1CCED3D1561 \
35-
# ; do \
36-
# gpg --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
37-
# done \
38-
# && gpg --batch --verify --quiet swift.tar.gz.sig swift.tar.gz \
39-
&& tar -xzf swift.tar.gz --directory / --strip-components=1 $SWIFT_VERSION-$SWIFT_PLATFORM/usr/lib/swift/linux \
40-
&& apt-get purge -y curl gpg \
41-
&& apt-get -y autoremove \
42-
&& rm -r /var/lib/apt/lists/* \
43-
# && rm -r "$GNUPGHOME" swift.tar.gz.sig \
44-
&& rm swift.tar.gz \
45-
&& chmod -R o+r /usr/lib/swift
32+
RUN set -e; \
33+
SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)/" \
34+
&& SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_VERSION/$SWIFT_VERSION-$SWIFT_PLATFORM.tar.gz" \
35+
&& SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \
36+
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
37+
&& export GNUPGHOME="$(mktemp -d)" \
38+
&& curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \
39+
&& gpg --batch --quiet --keyserver ha.pool.sks-keyservers.net --recv-keys "$SWIFT_SIGNING_KEY" \
40+
&& gpg --batch --quiet --verify swift.tar.gz.sig swift.tar.gz \
41+
# - Unpack the toolchain, set libs permissions, and clean up.
42+
&& tar -xzf swift.tar.gz --directory / --strip-components=1 \
43+
&& chmod -R o+r /usr/lib/swift \
44+
&& rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \
45+
&& apt-get purge --auto-remove -y curl gpg

0 commit comments

Comments
 (0)