Merge pull request #343 from NREL/deploy-fix

cleanup deploy script

.gitignore

@@ -20,5 +20,6 @@ rubocop-results.xml
 server-data
 worker-data
 
+
 # ignore files with ~ at end
 *~

Dockerfile

@@ -5,8 +5,6 @@
 
 FROM nrel/openstudio:2.5.0
 MAINTAINER Nicholas Long nicholas.long@nrel.gov
-ARG rails_env=docker
-ARG bundle_args="--without development test"
 
 # Install required libaries
 RUN sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 && \
@@ -71,6 +69,10 @@ ENV OPENSTUDIO_SERVER 'true'
 ENV OS_RAYPATH /usr/Radiance
 ENV PERL_EXE_PATH /usr/bin
 
+# Specify a couple arguments here, after running the majority of the installation above
+ARG rails_env=docker
+ARG bundle_args="--without development test"
+
 # Set the rails env var
 ENV RAILS_ENV $rails_env
 ENV GECKODRIVER_VERSION v0.15.0

circle.yml

@@ -32,11 +32,13 @@ test:
     # - docker-compose stop
   post:
     - rsync -av reports/ $CIRCLE_ARTIFACTS/reports/
+    # Reset the git checkout to remove the test-based data in the containers and rebuild
+    # Rebuild the web container as the env var affects
+    - git checkout -- .dockerignore && git checkout -- Dockerfile
+    - docker-compose -f docker-compose.test.yml build --build-arg rails_env=docker --build-arg bundle_args="--without development test" web
 
 deployment:
   production:
     branch: [develop, master, nrcan-master]
     commands:
-      - git checkout -- .dockerignore && git checkout -- Dockerfile
-      - docker-compose build --pull
       - source docker/deployment/scripts/circle_deployment.sh

docker/deployment/scripts/circle_deployment.sh

@@ -12,7 +12,7 @@ fi
 
 if [ "${IMAGETAG}" != "skip" ] && [ -z ${CI_PULL_REQUEST} ]; then
     # If CI_PULL_REQUEST is set, then the -z returns false (counter-intuitive)
-    docker-compose build --pull
+
     # Still need email with circleci, presumably because of the version of docker.
     docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS