Skip to content

Commit f0ecc57

Browse files
jonEbirdJon Miller
jonEbird
and
Jon Miller
authored
Correct the padding on the /etc/motd banners (#379)
The prior tab based padding of the /etc/motd banner lended itself to an error in the padding in length depending on the value of the Swift tag contents. The approach of using `printf` is a bit more friendly from a maintenance perspective. Lastly, there was a bug in how the bash code was included where the value of `$TERM` wasn't be escaped properly so you'd get a hardcoded value vs. the variable `$TERM`. Co-authored-by: Jon Miller <[email protected]>
1 parent e91bcc7 commit f0ecc57

File tree

46 files changed

+415
-368
lines changed

Some content is hidden

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

46 files changed

+415
-368
lines changed

‎nightly-5.10/amazonlinux/2/Dockerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,14 @@ RUN set -e; \
6262
# Print Installed Swift Version
6363
RUN swift --version
6464

65-
RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' \
66-
>> /etc/bashrc; \
67-
echo -e " ################################################################\n" \
68-
"#\t\t\t\t\t\t\t\t#\n" \
69-
"# Swift Nightly Docker Image\t\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
65+
RUN echo "[ -n \"\${TERM:-}\" -a -r /etc/motd ] && cat /etc/motd" >> /etc/bashrc; \
66+
( \
67+
printf "################################################################\n"; \
68+
printf "# %-60s #\n" ""; \
69+
printf "# %-60s #\n" "Swift Nightly Docker Image"; \
70+
printf "# %-60s #\n" "Tag: $(cat .swift_tag)"; \
71+
printf "# %-60s #\n" ""; \
72+
printf "################################################################\n" \
73+
) > /etc/motd
7374

7475
RUN echo 'source /etc/bashrc' >> /root/.bashrc

‎nightly-5.10/amazonlinux/2/buildx/Dockerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,14 @@ RUN set -e; \
6969
# Print Installed Swift Version
7070
RUN swift --version
7171

72-
RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' \
73-
>> /etc/bashrc; \
74-
echo -e " ################################################################\n" \
75-
"#\t\t\t\t\t\t\t\t#\n" \
76-
"# Swift Nightly Docker Image\t\t\t\t\t#\n" \
77-
"# Tag: $(cat .swift_tag)\t\t\t#\n" \
78-
"#\t\t\t\t\t\t\t\t#\n" \
79-
"################################################################\n" > /etc/motd
72+
RUN echo "[ -n \"\${TERM:-}\" -a -r /etc/motd ] && cat /etc/motd" >> /etc/bashrc; \
73+
( \
74+
printf "################################################################\n"; \
75+
printf "# %-60s #\n" ""; \
76+
printf "# %-60s #\n" "Swift Nightly Docker Image"; \
77+
printf "# %-60s #\n" "Tag: $(cat .swift_tag)"; \
78+
printf "# %-60s #\n" ""; \
79+
printf "################################################################\n" \
80+
) > /etc/motd
8081

8182
RUN echo 'source /etc/bashrc' >> /root/.bashrc

‎nightly-5.10/amazonlinux/2/slim/Dockerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,14 @@ RUN set -e; \
4242
&& rm -rf "$GNUPGHOME" latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
4343
&& yum autoremove -y tar gzip
4444

45-
RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' \
46-
>> /etc/bashrc; \
47-
echo -e " ################################################################\n" \
48-
"#\t\t\t\t\t\t\t\t#\n" \
49-
"# Swift Nightly Docker Image\t\t\t\t\t#\n" \
50-
"# Tag: $(cat .swift_tag)\t\t\t#\n" \
51-
"#\t\t\t\t\t\t\t\t#\n" \
52-
"################################################################\n" > /etc/motd
45+
RUN echo "[ -n \"\${TERM:-}\" -a -r /etc/motd ] && cat /etc/motd" >> /etc/bashrc; \
46+
( \
47+
printf "################################################################\n"; \
48+
printf "# %-60s #\n" ""; \
49+
printf "# %-60s #\n" "Swift Nightly Docker Image"; \
50+
printf "# %-60s #\n" "Tag: $(cat .swift_tag)"; \
51+
printf "# %-60s #\n" ""; \
52+
printf "################################################################\n" \
53+
) > /etc/motd
5354

5455
RUN echo 'source /etc/bashrc' >> /root/.bashrc

‎nightly-5.10/centos/7/Dockerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,12 @@ RUN set -e; \
6363
# Print Installed Swift Version
6464
RUN swift --version
6565

66-
RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' \
67-
>> /etc/bashrc; \
68-
echo -e " ################################################################\n" \
69-
"#\t\t\t\t\t\t\t\t#\n" \
70-
"# Swift Nightly Docker Image\t\t\t\t\t#\n" \
71-
"# Tag: $(cat .swift_tag)\t\t\t#\n" \
72-
"#\t\t\t\t\t\t\t\t#\n" \
73-
"################################################################\n" > /etc/motd
66+
RUN echo "[ -n \"\${TERM:-}\" -a -r /etc/motd ] && cat /etc/motd" >> /etc/bashrc; \
67+
( \
68+
printf "################################################################\n"; \
69+
printf "# %-60s #\n" ""; \
70+
printf "# %-60s #\n" "Swift Nightly Docker Image"; \
71+
printf "# %-60s #\n" "Tag: $(cat .swift_tag)"; \
72+
printf "# %-60s #\n" ""; \
73+
printf "################################################################\n" \
74+
) > /etc/motd

‎nightly-5.10/centos/7/slim/Dockerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@ RUN set -e; \
4040
&& chmod -R o+r /usr/lib/swift /usr/libexec/swift \
4141
&& rm -rf "$GNUPGHOME" latest_toolchain.tar.gz.sig latest_toolchain.tar.gz
4242

43-
RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' \
44-
>> /etc/bashrc; \
45-
echo -e " ################################################################\n" \
46-
"#\t\t\t\t\t\t\t\t#\n" \
47-
"# Swift Nightly Docker Image\t\t\t\t\t#\n" \
48-
"# Tag: $(cat .swift_tag)\t\t\t#\n" \
49-
"#\t\t\t\t\t\t\t\t#\n" \
50-
"################################################################\n" > /etc/motd
43+
RUN echo "[ -n \"\${TERM:-}\" -a -r /etc/motd ] && cat /etc/motd" >> /etc/bashrc; \
44+
( \
45+
printf "################################################################\n"; \
46+
printf "# %-60s #\n" ""; \
47+
printf "# %-60s #\n" "Swift Nightly Docker Image"; \
48+
printf "# %-60s #\n" "Tag: $(cat .swift_tag)"; \
49+
printf "# %-60s #\n" ""; \
50+
printf "################################################################\n" \
51+
) > /etc/motd

‎nightly-5.10/rhel-ubi/9/Dockerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,12 @@ RUN set -e; \
5656
# Print Installed Swift Version
5757
RUN swift --version
5858

59-
RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' \
60-
>> /etc/bashrc; \
61-
echo -e " ################################################################\n" \
62-
"#\t\t\t\t\t\t\t\t#\n" \
63-
"# Swift Nightly Docker Image\t\t\t\t\t#\n" \
64-
"# Tag: $(cat .swift_tag)\t\t\t#\n" \
65-
"#\t\t\t\t\t\t\t\t#\n" \
66-
"################################################################\n" > /etc/motd
59+
RUN echo "[ -n \"\${TERM:-}\" -a -r /etc/motd ] && cat /etc/motd" >> /etc/bashrc; \
60+
( \
61+
printf "################################################################\n"; \
62+
printf "# %-60s #\n" ""; \
63+
printf "# %-60s #\n" "Swift Nightly Docker Image"; \
64+
printf "# %-60s #\n" "Tag: $(cat .swift_tag)"; \
65+
printf "# %-60s #\n" ""; \
66+
printf "################################################################\n" \
67+
) > /etc/motd

‎nightly-5.10/rhel-ubi/9/buildx/Dockerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,14 @@ RUN set -e; \
6262
# Print Installed Swift Version
6363
RUN swift --version
6464

65-
RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' \
66-
>> /etc/bashrc; \
67-
echo -e " ################################################################\n" \
68-
"#\t\t\t\t\t\t\t\t#\n" \
69-
"# Swift Nightly Docker Image\t\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
65+
RUN echo "[ -n \"\${TERM:-}\" -a -r /etc/motd ] && cat /etc/motd" >> /etc/bashrc; \
66+
( \
67+
printf "################################################################\n"; \
68+
printf "# %-60s #\n" ""; \
69+
printf "# %-60s #\n" "Swift Nightly Docker Image"; \
70+
printf "# %-60s #\n" "Tag: $(cat .swift_tag)"; \
71+
printf "# %-60s #\n" ""; \
72+
printf "################################################################\n" \
73+
) > /etc/motd
7374

7475
RUN echo 'source /etc/bashrc' >> /root/.bashrc

‎nightly-5.10/rhel-ubi/9/slim/Dockerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@ RUN set -e; \
4040
&& chmod -R o+r /usr/lib/swift /usr/libexec/swift \
4141
&& rm -rf "$GNUPGHOME" latest_toolchain.tar.gz.sig latest_toolchain.tar.gz
4242

43-
RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' \
44-
>> /etc/bashrc; \
45-
echo -e " ################################################################\n" \
46-
"#\t\t\t\t\t\t\t\t#\n" \
47-
"# Swift Nightly Docker Image\t\t\t\t\t#\n" \
48-
"# Tag: $(cat .swift_tag)\t\t\t#\n" \
49-
"#\t\t\t\t\t\t\t\t#\n" \
50-
"################################################################\n" > /etc/motd
43+
RUN echo "[ -n \"\${TERM:-}\" -a -r /etc/motd ] && cat /etc/motd" >> /etc/bashrc; \
44+
( \
45+
printf "################################################################\n"; \
46+
printf "# %-60s #\n" ""; \
47+
printf "# %-60s #\n" "Swift Nightly Docker Image"; \
48+
printf "# %-60s #\n" "Tag: $(cat .swift_tag)"; \
49+
printf "# %-60s #\n" ""; \
50+
printf "################################################################\n" \
51+
) > /etc/motd

‎nightly-5.10/ubuntu/18.04/Dockerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,12 @@ RUN set -e; \
6363
# Print Installed Swift Version
6464
RUN swift --version
6565

66-
RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' \
67-
>> /etc/bash.bashrc; \
68-
echo " ################################################################\n" \
69-
"#\t\t\t\t\t\t\t\t#\n" \
70-
"# Swift Nightly Docker Image\t\t\t\t\t#\n" \
71-
"# Tag: $(cat .swift_tag)\t\t\t#\n" \
72-
"#\t\t\t\t\t\t\t\t#\n" \
73-
"################################################################\n" > /etc/motd
66+
RUN echo "[ -n \"\${TERM:-}\" -a -r /etc/motd ] && cat /etc/motd" >> /etc/bash.bashrc; \
67+
( \
68+
printf "################################################################\n"; \
69+
printf "# %-60s #\n" ""; \
70+
printf "# %-60s #\n" "Swift Nightly Docker Image"; \
71+
printf "# %-60s #\n" "Tag: $(cat .swift_tag)"; \
72+
printf "# %-60s #\n" ""; \
73+
printf "################################################################\n" \
74+
) > /etc/motd

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,12 @@ RUN set -e; \
5151
&& rm -rf "$GNUPGHOME" latest_toolchain.tar.gz.sig latest_toolchain.tar.gz \
5252
&& apt-get purge --auto-remove -y curl gnupg
5353

54-
RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' \
55-
>> /etc/bash.bashrc; \
56-
echo " ################################################################\n" \
57-
"#\t\t\t\t\t\t\t\t#\n" \
58-
"# Swift Nightly Docker Image\t\t\t\t\t#\n" \
59-
"# Tag: $(cat .swift_tag)\t\t\t#\n" \
60-
"#\t\t\t\t\t\t\t\t#\n" \
61-
"################################################################\n" > /etc/motd
54+
RUN echo "[ -n \"\${TERM:-}\" -a -r /etc/motd ] && cat /etc/motd" >> /etc/bash.bashrc; \
55+
( \
56+
printf "################################################################\n"; \
57+
printf "# %-60s #\n" ""; \
58+
printf "# %-60s #\n" "Swift Nightly Docker Image"; \
59+
printf "# %-60s #\n" "Tag: $(cat .swift_tag)"; \
60+
printf "# %-60s #\n" ""; \
61+
printf "################################################################\n" \
62+
) > /etc/motd

0 commit comments

Comments
 (0)