build: using takis and better image (#6774)

.travis.yml

@@ -19,7 +19,7 @@ env:
     - SEQ_MYSQL_USER: sequelize_test
     - SEQ_MYSQL_PW: sequelize_test
     - SEQ_MYSQL_HOST: 127.0.0.1
-    - SEQ_MYSQL_PORT: 8998
+    - SEQ_MYSQL_PORT: 8999
     # postgres info
     - SEQ_PG_DB: sequelize_test
     - SEQ_PG_USER: sequelize_test
@@ -35,7 +35,8 @@ env:
 
 before_script:
   - "if [ $POSTGRES_VER ] || [ $MYSQL_VER ]; then docker-compose up -d ${POSTGRES_VER} ${MYSQL_VER}; fi"
-  - "sleep 30s" # This allows enough time for docker to get up and running before tests occur
+  - "if [ $MYSQL_VER ]; then docker run --link ${MYSQL_VER}:db -e CHECK_PORT=3306 -e CHECK_HOST=db --net sequelize_default giorgos/takis; fi"
+  - "if [ $POSTGRES_VER ]; then docker run --link ${POSTGRES_VER}:db -e CHECK_PORT=5432 -e CHECK_HOST=db --net sequelize_default giorgos/takis; fi"
 
 script:
   - "if [ $COVERAGE ]; then npm run cover && bash <(curl -s https://codecov.io/bash) -f coverage/lcov.info; else npm run test; fi"

docker-compose.yml

@@ -3,19 +3,21 @@ version: '2'
 services:
   # PostgreSQL
   postgres-95:
-    image: camptocamp/postgis:9.5
+    image: mdillon/postgis:9.5
     environment:
       POSTGRES_USER: sequelize_test
       POSTGRES_PASSWORD: sequelize_test
     ports:
       - "127.0.0.1:8999:5432"
+    container_name: postgres-95
   postgres-94:
-    image: camptocamp/postgis:9.4
+    image: mdillon/postgis:9.4
     environment:
       POSTGRES_USER: sequelize_test
       POSTGRES_PASSWORD: sequelize_test
     ports:
       - "127.0.0.1:8999:5432"
+    container_name: postgres-94
 
   # MySQL
   mysql-57:
@@ -26,7 +28,8 @@ services:
       MYSQL_USER: sequelize_test
       MYSQL_PASSWORD: sequelize_test
     ports:
-      - "127.0.0.1:8998:3306"
+      - "127.0.0.1:8999:3306"
+    container_name: mysql-57
   mysql-56:
     image: mysql:5.6
     environment:
@@ -35,7 +38,8 @@ services:
       MYSQL_USER: sequelize_test
       MYSQL_PASSWORD: sequelize_test
     ports:
-      - "127.0.0.1:8998:3306"
+      - "127.0.0.1:8999:3306"
+    container_name: mysql-56
   mysql-55:
     image: mysql:5.5
     environment:
@@ -44,4 +48,5 @@ services:
       MYSQL_USER: sequelize_test
       MYSQL_PASSWORD: sequelize_test
     ports:
-      - "127.0.0.1:8998:3306"
+      - "127.0.0.1:8999:3306"
+    container_name: mysql-55