Merge pull request #8 from WeConnect/master

Updates to work with latest docker version and minor fixes
forward3d · Aug 16, 2017 · 40a252d · 40a252d
2 parents 85cb2fa + 3c09391
commit 40a252d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'sequel',     '~> 4.30'
-gem 'docker-api', '~> 1.25'
+gem 'docker-api', '~> 1.33.2'
 
 group :tester do
   # core
@@ -10,7 +10,7 @@ group :tester do
 
   # engines
   gem 'pg',        '~> 0.18.4'
-  gem 'mysql2',    '~> 0.4.2'
+  gem 'mysql2',    '~> 0.4.6'
   gem 'mongoid',   '~> 5.0', '>= 5.0.2'
   gem 'rethinkdb', '~> 2.2', '>= 2.2.0.2'
   gem 'sqlite3',   '~> 1.3', '>= 1.3.11'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -21,11 +21,11 @@ GEM
     colored (1.2)
     daemons (1.2.3)
     diff-lcs (1.2.5)
-    docker-api (1.25.0)
+    docker-api (1.33.2)
       excon (>= 0.38.0)
       json
     eventmachine (1.0.9.1)
-    excon (0.45.4)
+    excon (0.55.0)
     git-up (0.5.12)
       colored (>= 1.2)
       grit

diff --git a/lib/engines/mysql.rb b/lib/engines/mysql.rb
@@ -8,7 +8,7 @@ def initialize(params)
         @docker_tag ||= '5.7.10'
         @docker_env ||= ['MYSQL_ALLOW_EMPTY_PASSWORD=yes', "MYSQL_DATABASE=#{@database}"]
         @port ||= 3306
-        @sql_file ||= 'MySQL.sql'
+        @sql_file = params[:sql_file] || 'MySQL.sql'
       end
 
       def load_backup(path)

diff --git a/lib/engines/postgresql.rb b/lib/engines/postgresql.rb
@@ -8,7 +8,7 @@ def initialize(params)
         @docker_tag ||= '9.5.0'
         @docker_env ||= ["POSTGRES_USER=#{@database}", "POSTGRES_DB=#{@database}"]
         @port ||= 5432
-        @sql_file ||= 'PostgreSQL.sql'
+        @sql_file = params[:sql_file] ||  'PostgreSQL.sql'
       end
 
       def load_backup(path)