chore: Update dind

.drone.yml

@@ -1,13 +1,14 @@
 matrix:
   include:
-    - DOCKER_RUBY_VERSION: "2.2"
-      RUBY_IMAGE_TAG: "2.2-1"
+    - DOCKER_RUBY_VERSION: 2.2
+      RUBY_IMAGE_TAG: 2.2
 
-    - DOCKER_RUBY_VERSION: "1.9.3"
-      RUBY_IMAGE_TAG: "1.9.3-2"
+    - DOCKER_RUBY_VERSION: 1.9.3
+      RUBY_IMAGE_TAG: 1.9.3
 
 build:
-  image: abakpress/dind:1
+  image: abakpress/dind
+  pull: true
   privileged: true
   volumes:
     - /home/data/drone/images:/images
@@ -20,13 +21,10 @@ build:
   commands:
     - wrapdocker docker -v
 
-    - if [ ! -e /images/ssh-agent.tar ]; then docker pull whilp/ssh-agent; docker save whilp/ssh-agent > /images/ssh-agent.tar; fi
-    - if [ ! -e /images/ruby_$RUBY_IMAGE_TAG.tar ]; then docker pull abakpress/ruby:$RUBY_IMAGE_TAG; docker save abakpress/ruby:$RUBY_IMAGE_TAG > /images/ruby_$RUBY_IMAGE_TAG.tar; fi
-    - if [ ! -e /images/postgres_$POSTGRES_IMAGE_TAG.tar ]; then docker pull abakpress/postgres:$POSTGRES_IMAGE_TAG; docker save abakpress/postgres:$POSTGRES_IMAGE_TAG > /images/postgres_$POSTGRES_IMAGE_TAG.tar; fi
-
-    - docker load -i /images/ssh-agent.tar
-    - docker load -i /images/ruby_$RUBY_IMAGE_TAG.tar
-    - docker load -i /images/postgres_$POSTGRES_IMAGE_TAG.tar
+    - fetch-images
+      --image whilp/ssh-agent
+      --image abakpress/ruby:$RUBY_IMAGE_TAG
+      --image abakpress/postgres:$POSTGRES_IMAGE_TAG
 
     - dip ssh add -T -v /ssh_keys -k /ssh_keys/id_rsa
     - dip provision

Gemfile

@@ -3,10 +3,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in apress-amazon_assets.gemspec
 if RUBY_VERSION < '2'
-  gem 'public_suffix', '< 1.5'
+  gem "actionpack", "< 5"
   gem 'mime-types', '< 3.0'
-  gem 'pg', '< 0.19'
-  gem 'webmock', '< 2.3'
 else
   gem 'test-unit'
 end

docker-compose.yml

@@ -5,6 +5,7 @@ services:
     image: abakpress/ruby:$RUBY_IMAGE_TAG
     environment:
       - BUNDLE_PATH=/bundle/$DOCKER_RUBY_VERSION
+      - BUNDLE_CONFIG=/app/.bundle/config
       - SSH_AUTH_SOCK=/ssh/auth/sock
       - TEST_DB_HOST=db
       - TEST_DB_NAME=docker