Merge pull request #98 from fga-gpp-mds/issue_66_fixing_coverage_report

Author: MatheusRich

.dockerignore

@@ -1,4 +1,3 @@
-.git
 README.md
 
 .dockerignore

.travis.yml

@@ -37,10 +37,15 @@ notifications:
     slack: gppmds8-github:sJE6QlBfPGMkfUf48wuTsKa7
 
 script:
-  - docker-compose -f docker-compose.test.yml -p travis up -d
-  - docker logs -f falko-test
-  - test `docker wait falko-test | wc -l` == "1"
-
+  - docker-compose -f docker-compose.test.yml up -d
+  - docker-compose -f docker-compose.test.yml logs
+  - docker exec falko-test bundle install
+  - docker exec falko-test bundle exec rails db:create
+  - docker exec falko-test bundle exec rails db:migrate
+  - docker exec falko-test bundle exec rake db:test:prepare
+  - docker exec falko-test bundle exec rails test
+  - docker exec falko-test bash -c "CODECLIMATE_REPO_TOKEN=095bc7916972a84272890f2c79eaba7fd64124a4b5b4e826ba0a4d0599b6bfe3 bundle exec codeclimate-test-reporter"
+ 
 after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-  - docker exec falko-server /bin/bash -lc "CODECLIMATE_REPO_TOKEN=095bc7916972a84272890f2c79eaba7fd64124a4b5b4e826ba0a4d0599b6bfe3 bundle exec codeclimate-test-reporter"
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT --debug
+  - docker-compose down --remove-orphans

Dockerfile.test

@@ -16,6 +16,7 @@ RUN mkdir Falko-2017.2-BackEnd
 WORKDIR /Falko-2017.2-BackEnd
 
 COPY . /Falko-2017.2-BackEnd
+COPY .git/ /Falko-2017.2-BackEnd/.git/
 
 COPY Gemfile /Falko-2017.2-BackEnd/Gemfile
 COPY wait-4-postgres.sh /Falko-2017.2-BackEnd/wait-4-postgres.sh

docker-compose.test.yml

@@ -5,30 +5,22 @@ services:
     build: 
       context: .
       dockerfile: Dockerfile.test
-    command: /bin/bash -l -c "./wait-4-postgres.sh && bundle install && RAILS_ENV=test bundle exec rails db:create && RAILS_ENV=test bundle exec rails db:migrate && bundle exec rake db:test:prepare && bundle exec rails test"
-    links:
-      - falko-server
+    command: bash -c "./wait-4-postgres.sh && sleep infinity"
+    environment:
+      - RAILS_ENV=test
+    ports:
+      - 3000
+    depends_on:
+      - falko-database
 
   falko-database:
     container_name: falko-database
     image: postgres:9.6
     ports: 
       - 5432
     environment:
-      - PGDATA=/postgresql
       - PG_USER=postgres
       - PG_DATABASE=travis_ci_test
     volumes:
       - ./tmp/data/postgresql:/postgresql
       - .:/Falko-2017.2-BackEnd
-
-  falko-server:
-    container_name: falko-server
-    image: alaxalves/api:1.5
-    command: /bin/bash -l -c "bundle install && bundle exec rails s -p 3000 -b '0.0.0.0'"
-    environment:
-      - RAILS_ENV=test
-    volumes:
-      - .:/Falko-2017.2-BackEnd
-    depends_on:
-      - falko-database