Merge branch 'master' into 6-0-dev

Author: wpolicarpo

.travis.yml

@@ -15,7 +15,9 @@ script:
   - docker-compose run ci
 matrix:
   include:
-    - name: 2.5.5
-      env: TARGET_VERSION=2.5.5
-    - name: 2.6.3
-      env: TARGET_VERSION=2.6.3
+    - name: 2.5.8
+      env: TARGET_VERSION=2.5.8
+    - name: 2.6.6
+      env: TARGET_VERSION=2.6.6
+    - name: 2.7.1
+      env: TARGET_VERSION=2.7.1

Dockerfile renamed to Dockerfile.ci

@@ -1,6 +1,6 @@
 ARG TARGET_VERSION=2.6.3
 
-FROM wpolicarpo/activerecord-sqlserver-adapter:${TARGET_VERSION}
+FROM railssqlserver/activerecord-sqlserver-adapter:${TARGET_VERSION}
 
 ENV WORKDIR /activerecord-sqlserver-adapter
 

docker-compose.ci.yml

@@ -1,11 +1,13 @@
 version: "2.2"
 services:
-  database:
+  sqlserver:
     image: metaskills/mssql-server-linux-rails
   ci:
     environment:
-      - ACTIVERECORD_UNITTEST_HOST=database
-    build: .
-    command: wait-for database:1433 -- bundle exec rake test
+      - ACTIVERECORD_UNITTEST_HOST=sqlserver
+    build:
+      context: .
+      dockerfile: Dockerfile.ci
+    command: wait-for sqlserver:1433 -- bundle exec rake test
     depends_on:
-      - "database"
+      - "sqlserver"