Merge pull request #71 from gwu-libraries/t70-deploy

refs #70. Removes copying of wsgi.py and adds wait for mq. closes #70
gwu-libraries · Dec 4, 2015 · 8256058 · 8256058
2 parents ea118ee + 0a73bf3
commit 8256058
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/docker/app-master/invoke.sh b/docker/app-master/invoke.sh
@@ -1,13 +1,12 @@
 #!/bin/bash
 echo "Waiting for db"
-appdeps.py --wait-secs 30 --port-wait db:5432 --file /opt/sfm-ui
+appdeps.py --wait-secs 30 --port-wait db:5432 --file /opt/sfm-ui --port-wait mq:5672
 if [ "$?" = "1" ]; then
     echo "Problem with application dependencies."
     exit 1
 fi
 
-echo "Copying config"
-cp /tmp/wsgi.py /opt/sfm-ui/sfm/sfm/
+export DJANGO_SETTINGS_MODULE=sfm.settings.docker_settings
 
 echo "Syncing db"
 /opt/sfm-ui/sfm/manage.py syncdb --noinput

diff --git a/docker/app-prod/0.2.0/invoke.sh b/docker/app-prod/0.2.0/invoke.sh
@@ -1,13 +1,12 @@
 #!/bin/bash
 echo "Waiting for db"
-appdeps.py --wait-secs 30 --port-wait db:5432 --file /opt/sfm-ui
+appdeps.py --wait-secs 30 --port-wait db:5432 --file /opt/sfm-ui --port-wait mq:5672
 if [ "$?" = "1" ]; then
     echo "Problem with application dependencies."
     exit 1
 fi
 
-echo "Copying config"
-cp /tmp/wsgi.py /opt/sfm-ui/sfm/sfm/
+export DJANGO_SETTINGS_MODULE=sfm.settings.docker_settings
 
 echo "Syncing db"
 /opt/sfm-ui/sfm/manage.py syncdb --noinput