summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2015-10-16 21:19:33 +0200
committerChristian Heimes <christian@python.org>2015-10-16 21:19:33 +0200
commitffc5ceee7ef098e19cd70572bfaa214c5c50878c (patch)
tree427bfb858ab1efc54048703fc99f40620f372a89
parent91e382abd6a6b527ca3a1a8e6e83f4f21a115a75 (diff)
downloadcustodia_pwmgr-ffc5ceee7ef098e19cd70572bfaa214c5c50878c.tar.gz
custodia_pwmgr-ffc5ceee7ef098e19cd70572bfaa214c5c50878c.tar.xz
custodia_pwmgr-ffc5ceee7ef098e19cd70572bfaa214c5c50878c.zip
exec to get pid 1
-rwxr-xr-xpush.sh12
-rwxr-xr-xrun.sh4
2 files changed, 14 insertions, 2 deletions
diff --git a/push.sh b/push.sh
index a767741..695eb65 100755
--- a/push.sh
+++ b/push.sh
@@ -1,5 +1,17 @@
#!/bin/sh
set -e
+
+REPOS=https://fedorapeople.org/cgit/simo/public_git/custodia.git
+
+if [ ! -d custodia ]; then
+ git clone $REPOS
+fi
+
+pushd custodia > /dev/null
+git fetch --all
+git pull --rebase
+popd > /dev/null
+
sudo docker build -t 10.34.78.249:5000/custodia-pwmgr .
sudo docker push 10.34.78.249:5000/custodia-pwmgr
diff --git a/run.sh b/run.sh
index 631aff9..30f5c64 100755
--- a/run.sh
+++ b/run.sh
@@ -3,5 +3,5 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
export PYTHONPATH=$DIR/custodia
cd $DIR/custodia_pwmgr
-python2.7 custodia_pwmgr.py
-exit $?
+exec python2.7 custodia_pwmgr.py
+