From 5824d5545f225ec99e3c1f44e73bd9255caa23e7 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 28 Mar 2018 17:50:34 +0200 Subject: [PATCH] Fix double restore, push data dir, prod up options --- .gitmodules | 2 +- dev/restore_db.sh | 2 +- prod/push_data.sh | 2 ++ prod/up.sh | 2 +- prod/upgrade.sh | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index de78f8d..1372a4d 100644 --- 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 5916ad5..249c69d 100755 --- 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 1747db8..cb4c81d 100755 --- 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 c433bf9..57e2ced 100755 --- 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 a5f2382..8f88ec9 100755 --- 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 "" } -- 2.39.5