mcrain 0.2.1 → 0.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 14b5cc7a0134a7aa84cf8bb3add79184cb353134
4
- data.tar.gz: 5ec94f7b6ead6189e0a9baf39bdcdcbeef464678
3
+ metadata.gz: fd68563f4ea83a5418e1106ae7e2b3985ad32868
4
+ data.tar.gz: cb86a43b457ced1368d035f5135a431879bd55b1
5
5
  SHA512:
6
- metadata.gz: 21a4ff57facbdccce14a2f01b02b980bd4f1f28bb30615faccff1e6d35d696f3571d8d09a0613174e95dee39269c6089c314813124afcc516c59ab89a4970ee5
7
- data.tar.gz: a08f4b31866e06b85b5f321c36aaea6c2de33f01fab466c3f9757e710df18ebebaa54045a940568808bea54e14ea8d8ca4c10bd2099c14ac5e8007f4949c8b40
6
+ metadata.gz: caa302081b7135330540a07f646251b42819185b57ca13fe5e12dbeb9baab46da72f0d7a8ad6550200148fbc7c32f2946fefe24112f6a3598753e20eabb9d251
7
+ data.tar.gz: a08e8f63163bb78283bda59e4c1a8d92b560890a005790dc53dc03ece3aca99a5310d7d578b35f498ed786cd82933b7dbf0b12206f9c298c7d2bfbd2fe87c644
@@ -60,5 +60,13 @@ module Mcrain
60
60
  }
61
61
  end
62
62
 
63
+ def add_volume_options(r, path_on_container, path_on_host)
64
+ r['Volumes'] ||= {}
65
+ r['Volumes'][path_on_container] = {}
66
+ r['HostConfig']['Binds'] ||= []
67
+ r['HostConfig']['Binds'] << "#{path_on_host}:#{path_on_container}"
68
+ self
69
+ end
70
+
63
71
  end
64
72
  end
data/lib/mcrain/mysql.rb CHANGED
@@ -37,6 +37,8 @@ module Mcrain
37
37
  attr_accessor :database
38
38
  attr_accessor :username, :password
39
39
 
40
+ DB_DIR_ON_CONTAINER = '/var/lib/mysql'.freeze
41
+
40
42
  def build_docker_options
41
43
  r = super
42
44
 
@@ -47,7 +49,7 @@ module Mcrain
47
49
  envs << (password.blank? ? "MYSQL_ALLOW_EMPTY_PASSWORD=yes" : "#{key_pw}=#{password}")
48
50
  envs << "#{key_user}=#{username}" if key_user
49
51
  envs << "MYSQL_DATABASE=#{database}" if database
50
- envs << "#{File.expand_path(db_dir)}:/var/lib/mysql" if db_dir
52
+ add_volume_options(r, DB_DIR_ON_CONTAINER, File.expand_path(db_dir)) if db_dir && !db_dir.empty?
51
53
  r['Env'] = envs unless envs.empty?
52
54
  return r
53
55
  end
data/lib/mcrain/redis.rb CHANGED
@@ -33,10 +33,7 @@ module Mcrain
33
33
  def build_docker_options
34
34
  r = super
35
35
  if db_dir && !db_dir.empty?
36
- r['Volumes'] ||= {}
37
- r['Volumes'][DB_DIR_ON_CONTAINER] = {}
38
- r['HostConfig']['Binds'] ||= []
39
- r['HostConfig']['Binds'] << "#{db_dir}:#{DB_DIR_ON_CONTAINER}"
36
+ add_volume_options(r, DB_DIR_ON_CONTAINER, db_dir)
40
37
  end
41
38
  return r
42
39
  end
@@ -1,3 +1,3 @@
1
1
  module Mcrain
2
- VERSION = "0.2.1"
2
+ VERSION = "0.2.2"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mcrain
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.1
4
+ version: 0.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - akm