Skip to content

Commit df1dd82

Browse files
shahmishalshahmishal
authored
Merge pull request #154 from apple/shahmishal/nightly-master
Update the nightly docker images to include swift tag and update the …
2 parents 1cb54c6 + 0708c58 commit df1dd82

File tree

4 files changed

+46
-6
lines changed

4 files changed

+46
-6
lines changed

‎nightly-master/ubuntu/16.04/Dockerfile‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:16.04
22
LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
3-
LABEL Description="Docker Container for the Swift programming language"
3+
LABEL description="Docker Container for the Swift programming language"
44

55
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
66
apt-get -q install -y \
@@ -46,6 +46,7 @@ RUN set -e; \
4646
&& export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
4747
&& export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \
4848
&& export DOWNLOAD_DIR=$(echo $download | sed "s/-${OS_VER}.tar.gz//g") \
49+
&& echo $DOWNLOAD_DIR > .swift_tag \
4950
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
5051
&& export GNUPGHOME="$(mktemp -d)" \
5152
&& curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
@@ -60,3 +61,12 @@ RUN set -e; \
6061

6162
# Print Installed Swift Version
6263
RUN swift --version
64+
65+
RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' \
66+
>> /etc/bash.bashrc; \
67+
echo " ################################################################\n" \
68+
"#\t\t\t\t\t\t\t\t#\n" \
69+
"# Swift Nightly Docker Image\t\t\t\t#\n" \
70+
"# Tag: $(cat .swift_tag)\t\t\t#\n" \
71+
"#\t\t\t\t\t\t\t\t#\n" \
72+
"################################################################\n" > /etc/motd

‎nightly-master/ubuntu/16.04/slim/Dockerfile‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:16.04
22
LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
3-
LABEL Description="Docker Container for the Swift programming language"
3+
LABEL description="Docker Container for the Swift programming language"
44

55
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
66
apt-get -q install -y \
@@ -37,6 +37,7 @@ RUN set -e; \
3737
&& export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
3838
&& export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \
3939
&& export DOWNLOAD_DIR=$(echo $download | sed "s/-${OS_VER}.tar.gz//g") \
40+
&& echo $DOWNLOAD_DIR > .swift_tag \
4041
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
4142
&& export GNUPGHOME="$(mktemp -d)" \
4243
&& curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
@@ -47,4 +48,13 @@ RUN set -e; \
4748
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 ${DOWNLOAD_DIR}-${OS_VER}/usr/lib/swift/linux \
4849
&& chmod -R o+r /usr/lib/swift \
4950
&& rm -rf "$GNUPGHOME" latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
50-
&& apt-get purge --auto-remove -y curl
51+
&& apt-get purge --auto-remove -y curl
52+
53+
RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' \
54+
>> /etc/bash.bashrc; \
55+
echo " ################################################################\n" \
56+
"#\t\t\t\t\t\t\t\t#\n" \
57+
"# Swift Nightly Docker Image\t\t\t\t#\n" \
58+
"# Tag: $(cat .swift_tag)\t\t\t#\n" \
59+
"#\t\t\t\t\t\t\t\t#\n" \
60+
"################################################################\n" > /etc/motd

‎nightly-master/ubuntu/18.04/Dockerfile‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:18.04
22
LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
3-
LABEL Description="Docker Container for the Swift programming language"
3+
LABEL description="Docker Container for the Swift programming language"
44

55
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
66
apt-get -q install -y \
@@ -46,6 +46,7 @@ RUN set -e; \
4646
&& export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
4747
&& export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \
4848
&& export DOWNLOAD_DIR=$(echo $download | sed "s/-${OS_VER}.tar.gz//g") \
49+
&& echo $DOWNLOAD_DIR > .swift_tag \
4950
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
5051
&& export GNUPGHOME="$(mktemp -d)" \
5152
&& curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
@@ -60,3 +61,12 @@ RUN set -e; \
6061

6162
# Print Installed Swift Version
6263
RUN swift --version
64+
65+
RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' \
66+
>> /etc/bash.bashrc; \
67+
echo " ################################################################\n" \
68+
"#\t\t\t\t\t\t\t\t#\n" \
69+
"# Swift Nightly Docker Image\t\t\t\t#\n" \
70+
"# Tag: $(cat .swift_tag)\t\t\t#\n" \
71+
"#\t\t\t\t\t\t\t\t#\n" \
72+
"################################################################\n" > /etc/motd

‎nightly-master/ubuntu/18.04/slim/Dockerfile‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:18.04
22
LABEL maintainer="Swift Infrastructure <swift-infrastructure@swift.org>"
3-
LABEL Description="Docker Container for the Swift programming language"
3+
LABEL description="Docker Container for the Swift programming language"
44

55
RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \
66
apt-get -q install -y \
@@ -37,6 +37,7 @@ RUN set -e; \
3737
&& export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \
3838
&& export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \
3939
&& export DOWNLOAD_DIR=$(echo $download | sed "s/-${OS_VER}.tar.gz//g") \
40+
&& echo $DOWNLOAD_DIR > .swift_tag \
4041
# - Download the GPG keys, Swift toolchain, and toolchain signature, and verify.
4142
&& export GNUPGHOME="$(mktemp -d)" \
4243
&& curl -fsSL ${SWIFT_WEBROOT}/${DOWNLOAD_DIR}/${download} -o latest_toolchain.tar.gz \
@@ -47,4 +48,13 @@ RUN set -e; \
4748
&& tar -xzf latest_toolchain.tar.gz --directory / --strip-components=1 ${DOWNLOAD_DIR}-${OS_VER}/usr/lib/swift/linux \
4849
&& chmod -R o+r /usr/lib/swift \
4950
&& rm -rf "$GNUPGHOME" latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
50-
&& apt-get purge --auto-remove -y curl gnupg
51+
&& apt-get purge --auto-remove -y curl gnupg
52+
53+
RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' \
54+
>> /etc/bash.bashrc; \
55+
echo " ################################################################\n" \
56+
"#\t\t\t\t\t\t\t\t#\n" \
57+
"# Swift Nightly Docker Image\t\t\t\t#\n" \
58+
"# Tag: $(cat .swift_tag)\t\t\t#\n" \
59+
"#\t\t\t\t\t\t\t\t#\n" \
60+
"################################################################\n" > /etc/motd

0 commit comments

Comments
 (0)