Update docker-compose.yml for staging mail tests (WIP) (#2495)

* Update docker-compose.yml

* Drop explicit link to db container for host networking to work

* Direct app to db in host mode

* Open port to database

* Switch db to use container based networking (not host)

* Add some logging

* Exec tests within running container

.travis.yml

@@ -12,13 +12,15 @@ install:
   - docker-compose build
   - docker-compose up -d
   - docker-compose exec web sleep 5
+  - docker-compose logs db
+  - netstat -ltpn
   - docker-compose exec web bash -c "rake db:setup"
   - docker-compose exec web bash -c "rake db:migrate"
   - docker-compose exec web bower install --allow-root
   - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then gem install danger danger-junit; fi'
 
 script:
-  - docker-compose run -e CI=TRUE web bash -c "GENERATE_REPORT=true rake test:all"
+  - docker-compose exec web bash -c "CI=TRUE GENERATE_REPORT=true rake test:all"
   - echo -e '<?xml version="1.0" encoding="UTF-8"?>' > output.xml
   - tail -n +2 -q ./test/reports/TEST*.xml >> output.xml
   - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then danger --verbose; fi'

config/database.yml.example

@@ -6,8 +6,8 @@ test:
   username: plots
   password: plots
   database: plots
-  host: db
   encoding: utf8
+  host: 127.0.0.1
   pool: 5
   timeout: 5000
   strict: false

docker-compose.yml

@@ -2,6 +2,7 @@ version: "2"
 services:
   db:
     image: mariadb:10.2
+    network_mode: "service:web"
     environment:
       - MYSQL_DATABASE=plots
       - MYSQL_USER=plots
@@ -25,6 +26,4 @@ services:
       - .:/app
     ports:
       - "127.0.0.1:4000:4000"
-    links:
-      - db
     restart: unless-stopped