Fix double restore, push data dir, prod up options

diff --git a/.gitmodules b/.gitmodules
index de78f8d10b96ffbf91bb5379c216a9dc1ef95e3a..1372a4ddf29619cd88e4301474b2f92c73ff47e8 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "install"]
        path = install
-       url = https://github.com/yomguy/docker-composition-installer.git
+       url = git@github.com:yomguy/docker-composition-installer.git

diff --git a/dev/restore_db.sh b/dev/restore_db.sh
index 5916ad58383a0a648ff92d252c6fc2a26ebff581..249c69df0680935380a0e4117279fabe9a8f3441 100755 (executable)
--- a/dev/restore_db.sh
+++ b/dev/restore_db.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 docker-compose up -d db
-docker-compose run db bash -c "/srv/bin/misc/wait.sh; /srv/bin/dev/local/restore_db.sh; /srv/bin/dev/local/restore_db.sh"
+docker-compose run db bash -c "/srv/bin/misc/wait.sh; /srv/bin/dev/local/restore_db.sh"
 docker-compose stop db

diff --git a/prod/push_data.sh b/prod/push_data.sh
index 1747db8313392a5f7f69c865614a69c07329b9b8..cb4c81da8ea27bdffd9a70e287c876feef042194 100755 (executable)
--- a/prod/push_data.sh
+++ b/prod/push_data.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+cd "$(dirname "$0")"/../../
+
 echo "----------------------------"
 echo `date +\%Y\%m\%d-\%H-\%M-\%S`
 

diff --git a/prod/up.sh b/prod/up.sh
index c433bf94608904dc84534bdfc83bcfeda7f8c314..57e2cedc98c4eaba9bd16645cdfe060aea82985b 100755 (executable)
--- a/prod/up.sh
+++ b/prod/up.sh
@@ -3,7 +3,7 @@
 options=""
 
 if [ "$1" = "-d" ]; then
-    options=$options"-d";
+    options=$options" -d";
 fi
 
 docker-compose -f docker-compose.yml -f env/prod.yml up $options

diff --git a/prod/upgrade.sh b/prod/upgrade.sh
index a5f23827cee977f1214494eb1692c5e145f0c9ae..8f88ec9b0d499ae3644ebddd270ec18e9a0f959f 100755 (executable)
--- a/prod/upgrade.sh
+++ b/prod/upgrade.sh
@@ -12,7 +12,7 @@ function usage() {
     echo "  -f --front : build frontend"
     echo "  -d --doc : build documentation"
     echo "  -c --collect : collect static files"
-    echo "  -r --reload : reload Wsgi"
+    echo "  -r --reload : reload wsgi"
     echo "  -n --cron : install local cron to host"
     echo ""
 }