mcrain 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14b5cc7a0134a7aa84cf8bb3add79184cb353134
-  data.tar.gz: 5ec94f7b6ead6189e0a9baf39bdcdcbeef464678
+  metadata.gz: fd68563f4ea83a5418e1106ae7e2b3985ad32868
+  data.tar.gz: cb86a43b457ced1368d035f5135a431879bd55b1
 SHA512:
-  metadata.gz: 21a4ff57facbdccce14a2f01b02b980bd4f1f28bb30615faccff1e6d35d696f3571d8d09a0613174e95dee39269c6089c314813124afcc516c59ab89a4970ee5
-  data.tar.gz: a08f4b31866e06b85b5f321c36aaea6c2de33f01fab466c3f9757e710df18ebebaa54045a940568808bea54e14ea8d8ca4c10bd2099c14ac5e8007f4949c8b40
+  metadata.gz: caa302081b7135330540a07f646251b42819185b57ca13fe5e12dbeb9baab46da72f0d7a8ad6550200148fbc7c32f2946fefe24112f6a3598753e20eabb9d251
+  data.tar.gz: a08e8f63163bb78283bda59e4c1a8d92b560890a005790dc53dc03ece3aca99a5310d7d578b35f498ed786cd82933b7dbf0b12206f9c298c7d2bfbd2fe87c644

data/lib/mcrain/container_controller.rb

@@ -60,5 +60,13 @@ module Mcrain
       }
     end
 
+    def add_volume_options(r, path_on_container, path_on_host)
+      r['Volumes'] ||= {}
+      r['Volumes'][path_on_container] = {}
+      r['HostConfig']['Binds'] ||= []
+      r['HostConfig']['Binds'] << "#{path_on_host}:#{path_on_container}"
+      self
+    end
+
   end
 end

data/lib/mcrain/mysql.rb

@@ -37,6 +37,8 @@ module Mcrain
     attr_accessor :database
     attr_accessor :username, :password
 
+    DB_DIR_ON_CONTAINER = '/var/lib/mysql'.freeze
+
     def build_docker_options
       r = super
 
@@ -47,7 +49,7 @@ module Mcrain
       envs << (password.blank? ? "MYSQL_ALLOW_EMPTY_PASSWORD=yes" : "#{key_pw}=#{password}")
       envs << "#{key_user}=#{username}"  if key_user
       envs << "MYSQL_DATABASE=#{database}" if database
-      envs << "#{File.expand_path(db_dir)}:/var/lib/mysql" if db_dir
+      add_volume_options(r, DB_DIR_ON_CONTAINER, File.expand_path(db_dir)) if db_dir && !db_dir.empty?
       r['Env'] = envs unless envs.empty?
       return r
     end

data/lib/mcrain/redis.rb

@@ -33,10 +33,7 @@ module Mcrain
     def build_docker_options
       r = super
       if db_dir && !db_dir.empty?
-        r['Volumes'] ||= {}
-        r['Volumes'][DB_DIR_ON_CONTAINER] = {}
-        r['HostConfig']['Binds'] ||= []
-        r['HostConfig']['Binds'] << "#{db_dir}:#{DB_DIR_ON_CONTAINER}"
+        add_volume_options(r, DB_DIR_ON_CONTAINER, db_dir)
       end
       return r
     end

data/lib/mcrain/version.rb

@@ -1,3 +1,3 @@
 module Mcrain
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcrain
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - akm