Revert "Added an entrypoint to docker-compose to run database migrations when…"

.env

@@ -1,3 +1,3 @@
 COMPOSE_PROJECT_NAME=operationcodebackend
 REDIS_URL=redis://redis:6379/0
-#RAILS_ENV=development
+RAILS_ENV=development

.travis.yml

@@ -7,6 +7,11 @@ services:
 
 script:
   - make build
+  - |
+    while ! psql --host=localhost --username=postgres -c 'SELECT 1'> /dev/null 2>&1; do
+      echo 'Waiting for postgres...'
+      sleep 1;
+    done;
   - make test
   - if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ]; then make upgrade; fi
 

Dockerfile

@@ -17,3 +17,5 @@ ENV BUNDLE_GEMFILE=$APP_HOME/Gemfile \
 RUN bundle install --system
 
 ADD . $APP_HOME/
+
+CMD ["bundle", "exec", "puma", "-C", "config/puma.rb"]

Makefile

@@ -50,7 +50,7 @@ db_seed:
 .PHONY: test
 test: bg
 	docker-compose run operationcode-psql bash -c "while ! psql --host=operationcode-psql --username=postgres -c 'SELECT 1'; do sleep 5; done;"
-	docker-compose run ${RAILS_CONTAINER} bash -c 'RAILS_ENV=test bin/rails db:environment:set && rake db:test:prepare && RAILS_ENV=test bin/rails db:environment:set && rake test'
+	docker-compose run ${RAILS_CONTAINER} bash -c 'export RAILS_ENV=test && rake db:test:prepare && rake test'
 
 .PHONY: bundle
 bundle:

docker-compose.yml

@@ -2,8 +2,7 @@ version: '2'
 services:
   web:
     build: .
-    entrypoint: ["lib/docker-entrypoint.sh"]
-    command: ["bundle", "exec", "puma", "-C", "config/puma.rb"]
+    command: bundle exec puma -C config/puma.rb
     volumes:
       - .:/app
     volumes_from:
@@ -42,3 +41,4 @@ services:
       - redis
     env_file:
       - .env
+