Removing old homolog containers

publiclab · Jul 28, 2020 · b29dc9b · b29dc9b
1 parent 0eac3e7
commit b29dc9b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -55,11 +55,7 @@ jobs:
     - name: "Controllers Tests"
       script: rails test:controllers
     - name: "Integration Tests"
-<<<<<<< HEAD
       script: rails test:integration
-=======
-      script: rake test:integration
->>>>>>> 0581703407b27d313c210f2d63ffc6cd125d1e1a
     - name: "Docker Builds"
       script: docker build -t swbench .
     - name: "Asset Precompilation"

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ endef
 
 redeploy-container:
 	# docker-compose down --volumes
-	docker-compose up --force-recreate -d
+	docker-compose up -d
 	# $(call wait_for_container)
 	sleep 30
 	docker-compose logs
diff --git a/spectral.env b/spectral.env
@@ -7,5 +7,5 @@ MYSQL_HOST=db
 RAILS_ENV=production
 SENTRY_DSN
 RECAPTCHA_KEY
-PORT=5000
+PORT
 RECAPTCHA_SITE_KEY