From 7ab1d9df6d2e57a94b34150dcb8c20c42abb1f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Fri, 23 Dec 2016 02:51:46 +0100 Subject: [PATCH] add load_build in c3nav.bash and s/python3/python/ --- deployment/docker/c3nav.bash | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/deployment/docker/c3nav.bash b/deployment/docker/c3nav.bash index 875e02e9..06617c35 100644 --- a/deployment/docker/c3nav.bash +++ b/deployment/docker/c3nav.bash @@ -11,7 +11,7 @@ fi ls /data/map -python3 manage.py migrate --noinput +python manage.py migrate --noinput if [ "$1" == "webworker" ]; then exec gunicorn c3nav.wsgi \ @@ -31,47 +31,61 @@ fi if [ "$1" == "loadmap" ]; then echo "" echo "### loading map..." - exec python3 manage.py loadmap -y + exec python manage.py loadmap -y fi if [ "$1" == "checkmap" ]; then echo "" echo "### checking map..." - exec python3 manage.py checkmap + exec python manage.py checkmap fi if [ "$1" == "editor" ]; then echo "" echo "### starting editor..." - exec python3 manage.py runserver 0.0.0.0:8000 + exec python manage.py runserver 0.0.0.0:8000 fi if [ "$1" == "build" ]; then echo "" echo "### rendering map..." - python3 manage.py rendermap + python manage.py rendermap echo "" echo "### building graph..." - exec python3 manage.py buildgraph + exec python manage.py buildgraph +fi + +if [ "$1" == "load_build" ]; then + echo "" + echo "### loading map..." + python manage.py loadmap -y + + echo "" + echo "### rendering map..." + python manage.py rendermap + + echo "" + echo "### building graph..." + exec python manage.py buildgraph fi if [ "$1" == "all" ]; then echo "" echo "### loading map..." - python3 manage.py loadmap -y + python manage.py loadmap -y echo "" echo "### rendering map..." - python3 manage.py rendermap + python manage.py rendermap echo "" echo "### building graph..." - python3 manage.py buildgraph + python manage.py buildgraph echo "" echo "### running server..." - exec python3 manage.py runserver 0.0.0.0:8000 + exec python manage.py runserver 0.0.0.0:8000 fi echo "Specify argument: webworker|taskworker|loadmap|checkmap|editor|build|all"