Merge pull request #56 from ricardogama/bump-bookshelf

Add support for Bookshelf 1.0.0

.travis.yml

@@ -1,21 +1,16 @@
-language: node_js
-
-services:
-  - mysql
+dist: bionic
 
-addons:
-  postgresql: "9.2"
+language: node_js
 
 before_script:
+  - docker-compose up -d
   - cp test/mysql/knexfile.js.dist test/mysql/knexfile.js
   - cp test/postgres/knexfile.js.dist test/postgres/knexfile.js
   - cp test/sqlite/knexfile.js.dist test/sqlite/knexfile.js
-  - mysql -e "create database \`bookshelf-json-columns\`;" -uroot
-  - psql -U postgres -c 'create database "bookshelf-json-columns";'
+  - docker exec mysql mysql -e "create database \`bookshelf-json-columns\`;" -uroot
+  - docker exec postgres psql -U postgres -c 'create database "bookshelf-json-columns";'
 
 node_js:
-  - "4"
-  - "5"
   - "6"
   - "7"
 

docker-compose.yml

@@ -0,0 +1,28 @@
+version: '2.3'
+
+services:
+  postgres:
+    image: postgres
+    container_name: postgres
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+    ports:
+      - 5432:5432
+
+  mysql:
+    image: mariadb:10.3.13
+    container_name: mysql
+    environment:
+      MYSQL_ALLOW_EMPTY_PASSWORD: 'true'
+    healthcheck:
+      test: "/usr/bin/mysql --user=root --execute \"SHOW DATABASES;\""
+    ports:
+      - 3307:3306
+
+  wait:
+    image: alpine
+    depends_on:
+      mysql:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy