summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2015-10-16 21:20:30 +0200
committerChristian Heimes <christian@python.org>2015-10-16 21:20:30 +0200
commitad6a6afd220c3e0417614e40493c8ba191d05842 (patch)
treef988212cef7ae11a62576f0938a55484c1a42e3b
parent68be9151122af87552b0daf2dd213066f1546f91 (diff)
downloadcustodia_docker-ad6a6afd220c3e0417614e40493c8ba191d05842.tar.gz
custodia_docker-ad6a6afd220c3e0417614e40493c8ba191d05842.tar.xz
custodia_docker-ad6a6afd220c3e0417614e40493c8ba191d05842.zip
exec to get pid 1
-rwxr-xr-xpush.sh1
-rwxr-xr-xrun.sh3
2 files changed, 2 insertions, 2 deletions
diff --git a/push.sh b/push.sh
index a483beb..c718e34 100755
--- a/push.sh
+++ b/push.sh
@@ -8,6 +8,7 @@ if [ ! -d custodia ]; then
fi
pushd custodia > /dev/null
+git fetch --all
git pull --rebase
popd > /dev/null
diff --git a/run.sh b/run.sh
index 1fbb20a..282bae8 100755
--- a/run.sh
+++ b/run.sh
@@ -2,6 +2,5 @@
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
export PYTHONPATH=$DIR/custodia
-$DIR/custodia/custodia/custodia /custodia-data/custodia.conf
-exit $?
+exec $DIR/custodia/custodia/custodia /custodia-data/custodia.conf