diff --git a/makeabilitylabwebsite/rebuildanddeploy.sh b/makeabilitylabwebsite/rebuildanddeploy.sh index e12aaf7b..d9b3451f 100755 --- a/makeabilitylabwebsite/rebuildanddeploy.sh +++ b/makeabilitylabwebsite/rebuildanddeploy.sh @@ -5,14 +5,11 @@ cd ../ #if we're on a test system, lets mount the test volume if [[ $(hostname -s) == *"test"* ]] ; then - sed -i 's,makelab/www:,makelab/www-test:,' docker-compose.yml export DJANGO_ENV=TEST + docker-compose -f docker-compose.yml -f docker-compose-test.yml build website + docker-compose -f docker-compose.yml -f docker-compose-test.yml up -d else export DJANGO_ENV=PROD + docker-compose -f docker-compose.yml -f docker-compose-prod.yml build website + docker-compose -f docker-compose.yml -f docker-compose-prod.yml up -d fi - -#First, build the website image -docker-compose build website - -#second bring up any containers that are down, recreating any that have a newer image. -docker-compose up -d diff --git a/rebuildanddeploy.sh b/rebuildanddeploy.sh deleted file mode 100755 index d9b3451f..00000000 --- a/rebuildanddeploy.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -#navigate to the root directory -cd ../ - -#if we're on a test system, lets mount the test volume -if [[ $(hostname -s) == *"test"* ]] ; then - export DJANGO_ENV=TEST - docker-compose -f docker-compose.yml -f docker-compose-test.yml build website - docker-compose -f docker-compose.yml -f docker-compose-test.yml up -d -else - export DJANGO_ENV=PROD - docker-compose -f docker-compose.yml -f docker-compose-prod.yml build website - docker-compose -f docker-compose.yml -f docker-compose-prod.yml up -d -fi