From a122b720e9c61b38cfe502dcb63a9c119220c4c1 Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Mon, 3 Jun 2019 08:57:23 -0700
Subject: [PATCH] Dockerfile cleanup

- Use `set -e` in all install scripts. Clean up swift_needs to still
  work properly and exit cleanly under `set -e`.
- Drop some redundant slashes.

Change-Id: I05f38c6366e3da0aeed2b6451a8bd9d7dc531119
---
 docker/install_scripts/00_swift_needs.sh           |  4 ++--
 docker/install_scripts/10_apk_install_prereqs.sh   |  1 +
 .../15_install_python_and_pip_src.sh               |  1 +
 docker/install_scripts/20_pip_install_prereqs.sh   |  1 +
 docker/install_scripts/50_swift_install.sh         |  1 +
 docker/install_scripts/60_pip_uninstall_dev.sh     |  1 +
 docker/install_scripts/99_apk_uninstall_dev.sh     |  1 +
 docker/install_scripts/python_test_dirs            | 14 +++++++-------
 8 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/docker/install_scripts/00_swift_needs.sh b/docker/install_scripts/00_swift_needs.sh
index 89e737f500..b83621d7b0 100755
--- a/docker/install_scripts/00_swift_needs.sh
+++ b/docker/install_scripts/00_swift_needs.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
+set -e
 
 # adduser -D -H syslog && \
 for user in "swift"; do
-  id -u $user > /dev/null 2>&1
-  if [ ! $? == '0' ]; then
+  if ! id -u $user > /dev/null 2>&1 ; then
     adduser -D $user
     printf "created user $user\n"
   fi
diff --git a/docker/install_scripts/10_apk_install_prereqs.sh b/docker/install_scripts/10_apk_install_prereqs.sh
index 58ee435a3f..d311a29b10 100755
--- a/docker/install_scripts/10_apk_install_prereqs.sh
+++ b/docker/install_scripts/10_apk_install_prereqs.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 apk add --update \
   linux-headers \
diff --git a/docker/install_scripts/15_install_python_and_pip_src.sh b/docker/install_scripts/15_install_python_and_pip_src.sh
index 286523db3b..294ec92f17 100755
--- a/docker/install_scripts/15_install_python_and_pip_src.sh
+++ b/docker/install_scripts/15_install_python_and_pip_src.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 echo
 echo
diff --git a/docker/install_scripts/20_pip_install_prereqs.sh b/docker/install_scripts/20_pip_install_prereqs.sh
index fe41b3b367..d9cc9e6b44 100755
--- a/docker/install_scripts/20_pip_install_prereqs.sh
+++ b/docker/install_scripts/20_pip_install_prereqs.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 echo "+ + + + + + + + + + upgrading pip" && \
 pip install -U pip && \
diff --git a/docker/install_scripts/50_swift_install.sh b/docker/install_scripts/50_swift_install.sh
index 5a6ec2c6ef..c189e4e445 100755
--- a/docker/install_scripts/50_swift_install.sh
+++ b/docker/install_scripts/50_swift_install.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 pip install -U pip && \
 cd /opt/swift && \
diff --git a/docker/install_scripts/60_pip_uninstall_dev.sh b/docker/install_scripts/60_pip_uninstall_dev.sh
index 081b4292b6..655aba5ccc 100755
--- a/docker/install_scripts/60_pip_uninstall_dev.sh
+++ b/docker/install_scripts/60_pip_uninstall_dev.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 echo "- - - - - - - - uninstalling simplejson"
 pip uninstall --yes simplejson
diff --git a/docker/install_scripts/99_apk_uninstall_dev.sh b/docker/install_scripts/99_apk_uninstall_dev.sh
index 34c9fc4fc4..5d1726c7b9 100755
--- a/docker/install_scripts/99_apk_uninstall_dev.sh
+++ b/docker/install_scripts/99_apk_uninstall_dev.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 cd /
 rm -rf /build
diff --git a/docker/install_scripts/python_test_dirs b/docker/install_scripts/python_test_dirs
index 593815e8f0..7441673abe 100644
--- a/docker/install_scripts/python_test_dirs
+++ b/docker/install_scripts/python_test_dirs
@@ -1,10 +1,10 @@
-/opt/python/usr/local/lib/python3.6//ctypes/test
-/opt/python/usr/local/lib/python3.6//distutils/tests
-/opt/python/usr/local/lib/python3.6//idlelib/idle_test
-/opt/python/usr/local/lib/python3.6//lib2to3/tests
-/opt/python/usr/local/lib/python3.6//sqlite3/test
-/opt/python/usr/local/lib/python3.6//test
-/opt/python/usr/local/lib/python3.6//tkinter/test
+/opt/python/usr/local/lib/python3.6/ctypes/test
+/opt/python/usr/local/lib/python3.6/distutils/tests
+/opt/python/usr/local/lib/python3.6/idlelib/idle_test
+/opt/python/usr/local/lib/python3.6/lib2to3/tests
+/opt/python/usr/local/lib/python3.6/sqlite3/test
+/opt/python/usr/local/lib/python3.6/test
+/opt/python/usr/local/lib/python3.6/tkinter/test
 /opt/python/usr/local/lib/python2.7/bsddb/test
 /opt/python/usr/local/lib/python2.7/ctypes/test
 /opt/python/usr/local/lib/python2.7/distutils/tests