Working (but untested) setup for new prod environment

toobigtoignore · Aug 28, 2018 · aee4c5a · aee4c5a
1 parent 1ed8057
commit aee4c5a
Show file tree

Hide file tree

Showing 3 changed files with 1,527 additions and 1,528 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,10 +10,10 @@ version: '2'
 
 services: 
   web: 
-    #image: tbti/web:latest 
-    build: "."
-    command: "yes" #/bin/bash -c './scripts/wait-for-it.sh 0.0.0.0:5432 -- sleep 30
-    #&& python manage.py collectstatic --noinput && gunicorn issf_prod.wsgi -b 0.0.0.0:80'"
+    image: tbti/web:latest 
+    #build: "."
+    command: "/bin/bash -c './scripts/wait-for-it.sh 0.0.0.0:5432 -- sleep 30
+    && python manage.py collectstatic --noinput && gunicorn issf_prod.wsgi -b 0.0.0.0:80'"
     depends_on: 
       - db 
     environment: 

diff --git a/first_run.sh b/first_run.sh
@@ -9,6 +9,5 @@ docker-compose up -d db
 for Postgres container..." && sleep 60 && ./scripts/postgres_setup.sh
 docker-compose up -d 
 
-# Create a virtualenv that Nginx/Django integration seems to 
-# require ...
-#docker-compose exec -T web /bin/bash -c 'virtualenv ../issf/'
+docker-compose exec -T web /bin/bash -c 'npm install'
+docker-compose exec -T web /bin/bash -c 'virtualenv ../issf'