Fix path, add doc build to upgrade

diff --git a/bin/db/backup.sh b/bin/db/backup.sh
index 35b7e2f58799d928b316240cf568406ce9d8a5fe..300a3d81559bd0e35e9acde5553f36cf0b8a68e5 100755 (executable)
--- a/bin/db/backup.sh
+++ b/bin/db/backup.sh
@@ -2,6 +2,6 @@
 
 export PGPASSWORD=$POSTGRES_PASSWORD
 
-pg_dump -Fc -hdb -Upostgres -dpostgres > /srv/backup/ircam-www.dump
+pg_dump -Fc -hdb -Upostgres -dpostgres > /srv/backup/postgres.dump
 
 echo "Backup done!"

diff --git a/bin/db/restore.sh b/bin/db/restore.sh
index cd529b9575f776214a0ccfaa019d1f27ca2fceb7..c084a16a7513feff525f1926c73ba26ee081410b 100755 (executable)
--- a/bin/db/restore.sh
+++ b/bin/db/restore.sh
@@ -2,6 +2,6 @@
 
 export PGPASSWORD=$POSTGRES_PASSWORD
 
-pg_restore -c -Fc -hdb -Upostgres -dpostgres /srv/backup/ircam-www.dump
+pg_restore -c -Fc -hdb -Upostgres -dpostgres /srv/backup/postgres.dump
 
 echo "Restore done!"

diff --git a/bin/push.sh b/bin/push.sh
index 710b0fdd8618d1c1aabff1a8ae9db1068fefd732..198e2d5b6a2b90670f8cdc667e1debe58efd636c 100755 (executable)
--- a/bin/push.sh
+++ b/bin/push.sh
@@ -2,9 +2,9 @@
 
 echo "----------------------------"
 echo `date +\%Y\%m\%d-\%H-\%M-\%S`
-docker-compose run db /srv/bin/backup_db.sh
+docker-compose run db /srv/bin/db/backup.sh
 cd var
 git add .
 git commit -a -m "update DB and media"
-git pull origin master
-git push origin master
+git pull
+git push

diff --git a/bin/upgrade.sh b/bin/upgrade.sh
index e7951b1f90bfbf49073acd506fb71b5589b99ac6..61f68efc9a1aaa907b04288ea60757e8b77b1c88 100755 (executable)
--- a/bin/upgrade.sh
+++ b/bin/upgrade.sh
@@ -3,9 +3,10 @@
 # Use this script to update a dev/prod server
 
 git pull
-git submodule foreach git pull origin master
+git submodule foreach git pull
 docker-compose run app python /srv/app/manage.py migrate
 # docker-compose run app python /srv/app/manage.py update_translation_fields
 bower install
 gulp build
 docker-compose run app python /srv/app/manage.py collectstatic --noinput
+docker-compose run app bash /srv/app/doc/build.sh