From 4cdf675af8403502881c701b4c7a81e983f921b3 Mon Sep 17 00:00:00 2001 From: M Clark Date: Wed, 6 Jan 2016 13:24:21 +0800 Subject: [PATCH] Update docker-entrypoint.sh --- docker-entrypoint.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 6344e4a..10bc28f 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -12,12 +12,19 @@ function defaults { function initialise_devpi { echo "[RUN]: Initialise devpi-server" - devpi-server --start --host 127.0.0.1 --port 3141 + devpi-server --restrict-modify root --start --host 127.0.0.1 --port 3141 devpi-server --status devpi use http://localhost:3141 - devpi login root --password='' - devpi user -m root password="${DEVPI_PASSWORD}" - devpi index -y -c public pypi_whitelist='*' + + # Check the root password has been changed + if devpi login root --password='' > /dev/null; then + devpi login root --password='' + devpi user -m root password="${DEVPI_PASSWORD}" + devpi index -y -c public pypi_whitelist='*' + else + echo root password already changed + fi + devpi-server --stop devpi-server --status } @@ -30,7 +37,7 @@ if [ "$1" = 'devpi' ]; then fi echo "[RUN]: Launching devpi-server" - devpi-server --host 0.0.0.0 --port 3141 2>&1 | tee /data/server/devpi.log + devpi-server --restrict-modify root --host 0.0.0.0 --port 3141 2>&1 | tee /data/server/devpi.log exit $? fi