Skip to content
This repository was archived by the owner on Jun 29, 2019. It is now read-only.

Commit 40a252d

Browse files
authored
Merge pull request #8 from WeConnect/master
Updates to work with latest docker version and minor fixes
2 parents 85cb2fa + 3c09391 commit 40a252d

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22

33
gem 'sequel', '~> 4.30'
4-
gem 'docker-api', '~> 1.25'
4+
gem 'docker-api', '~> 1.33.2'
55

66
group :tester do
77
# core
@@ -10,7 +10,7 @@ group :tester do
1010

1111
# engines
1212
gem 'pg', '~> 0.18.4'
13-
gem 'mysql2', '~> 0.4.2'
13+
gem 'mysql2', '~> 0.4.6'
1414
gem 'mongoid', '~> 5.0', '>= 5.0.2'
1515
gem 'rethinkdb', '~> 2.2', '>= 2.2.0.2'
1616
gem 'sqlite3', '~> 1.3', '>= 1.3.11'

Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ GEM
2121
colored (1.2)
2222
daemons (1.2.3)
2323
diff-lcs (1.2.5)
24-
docker-api (1.25.0)
24+
docker-api (1.33.2)
2525
excon (>= 0.38.0)
2626
json
2727
eventmachine (1.0.9.1)
28-
excon (0.45.4)
28+
excon (0.55.0)
2929
git-up (0.5.12)
3030
colored (>= 1.2)
3131
grit

lib/engines/mysql.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def initialize(params)
88
@docker_tag ||= '5.7.10'
99
@docker_env ||= ['MYSQL_ALLOW_EMPTY_PASSWORD=yes', "MYSQL_DATABASE=#{@database}"]
1010
@port ||= 3306
11-
@sql_file ||= 'MySQL.sql'
11+
@sql_file = params[:sql_file] || 'MySQL.sql'
1212
end
1313

1414
def load_backup(path)

lib/engines/postgresql.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def initialize(params)
88
@docker_tag ||= '9.5.0'
99
@docker_env ||= ["POSTGRES_USER=#{@database}", "POSTGRES_DB=#{@database}"]
1010
@port ||= 5432
11-
@sql_file ||= 'PostgreSQL.sql'
11+
@sql_file = params[:sql_file] || 'PostgreSQL.sql'
1212
end
1313

1414
def load_backup(path)

0 commit comments

Comments
 (0)