Merge pull request #43 from NYULibraries/feature/circleci2

Feature/circleci2
NYULibraries · May 24, 2017 · ecf7d6b · ecf7d6b
2 parents 4adcfa9 + f018ecf
commit ecf7d6b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -21,6 +21,7 @@ jobs:
             docker-compose up -d
             docker run --network container:marli \
               appropriate/curl --retry 10 --retry-delay 1 --retry-connrefused http://localhost:3000
+            docker-compose exec web rake db:setup
             docker-compose exec web rake
 
       # - deploy:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -28,10 +28,11 @@ services:
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
   setup_tests:
     build: .
-    command: rake db:setup
+    command: bundle exec rake db:setup
     volumes:
       - .:/app
     environment:
+      RAILS_ENV: test
       MARLI_DB_HOST: db
     links:
       - db