openstack/swift
Code Issues Proposed changes

Dockerfile cleanup

Browse Source 
- 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
This commit is contained in:
Tim Burke 2019-06-03 08:57:23 -07:00
parent 23eca56ce0
commit a122b720e9
8 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/install_scripts/00_swift_needs.sh
View File

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
set -e
# adduser -D -H syslog && \ # adduser -D -H syslog && \
for user in "swift"; do for user in "swift"; do
id -u $user > /dev/null 2>&1 if ! id -u $user > /dev/null 2>&1 ; then
if [ ! $? == '0' ]; then
adduser -D $user adduser -D $user
printf "created user $user\n" printf "created user $user\n"
fi fi

1
docker/install_scripts/10_apk_install_prereqs.sh
View File

@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
apk add --update \ apk add --update \
linux-headers \ linux-headers \

1
docker/install_scripts/15_install_python_and_pip_src.sh
View File

@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
echo echo
echo echo

1
docker/install_scripts/20_pip_install_prereqs.sh
View File

@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
echo "+ + + + + + + + + + upgrading pip" && \ echo "+ + + + + + + + + + upgrading pip" && \
pip install -U pip && \ pip install -U pip && \

1
docker/install_scripts/50_swift_install.sh
View File

@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
pip install -U pip && \ pip install -U pip && \
cd /opt/swift && \ cd /opt/swift && \

1
docker/install_scripts/60_pip_uninstall_dev.sh
View File

@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
echo "- - - - - - - - uninstalling simplejson" echo "- - - - - - - - uninstalling simplejson"
pip uninstall --yes simplejson pip uninstall --yes simplejson

1
docker/install_scripts/99_apk_uninstall_dev.sh
View File

@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
cd / cd /
rm -rf /build rm -rf /build

14
docker/install_scripts/python_test_dirs
View File

@ -1,10 +1,10 @@
/opt/python/usr/local/lib/python3.6//ctypes/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/distutils/tests
/opt/python/usr/local/lib/python3.6//idlelib/idle_test /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/lib2to3/tests
/opt/python/usr/local/lib/python3.6//sqlite3/test /opt/python/usr/local/lib/python3.6/sqlite3/test
/opt/python/usr/local/lib/python3.6//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/tkinter/test
/opt/python/usr/local/lib/python2.7/bsddb/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/ctypes/test
/opt/python/usr/local/lib/python2.7/distutils/tests /opt/python/usr/local/lib/python2.7/distutils/tests