From b29dc9b87edf1552b2782f6b3c5b0004f665d796 Mon Sep 17 00:00:00 2001 From: Alax Alves Date: Tue, 28 Jul 2020 14:42:09 -0300 Subject: [PATCH] Removing old homolog containers --- .travis.yml | 4 ---- Makefile | 2 +- spectral.env | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index a5a778fd..118f8959 100644 --- 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 index 58fb5e25..2fd493c7 100644 --- 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 index 5f9241fb..4c02f879 100644 --- 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