docker-builder 0.1.41 → 0.1.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bacc61b8a7092799d7984a6d95b5c16f7b15c38a
-  data.tar.gz: 7670e656db1f00ae248df9471e631949575efdb7
+  metadata.gz: 5397c647c4db18a0ba0db4bf1e34c652e390d786
+  data.tar.gz: d22e380da70140e7cb6a705ca12e505011df2c1d
 SHA512:
-  metadata.gz: bad544f02250651a75102f403e1d5ccf76218c3c14e4eb8c7905f18108153e55cbfb7b3be9c2658c5f51c6ab45b0e617649efc2fe1db14c519a9c916b1c89078
-  data.tar.gz: 3ec8237997dd2919b96ecfff2b346e6b21984b4631477e77d771b810e12a6d664f20838c81bc96275839b9ed93a58b17cf6c79f21fb3babacaa9a4442fe361ba
+  metadata.gz: fbaa35b3d1e1d622c9b4f544de84978db8f85f485f04b59d1f29021aa776d758bc1314031cb5431dcbd7eb30d823ad2e71d95805df45ab15158e7f9e01b159f4
+  data.tar.gz: 6958f5830f5f8abd0d7b76fe05c741cafe937ce23442dbfef745217775ebdb7d9580dd65a6986d967e6b14965992acef0aac9188f8063d758bf9787b2ee635ab

data/install_local.sh

@@ -1,2 +1,2 @@
 gem build docker-builder.gemspec
-gem install ./docker-builder-0.1.41.gem
+gem install ./docker-builder-0.1.43.gem

data/lib/docker_builder/manager.rb

@@ -156,18 +156,6 @@ class Manager
     setup_network(settings)
 
 
-    ### BEFORE START
-
-    # run setup provision scripts
-    setup_scripts = (settings['provision']['setup'] rescue [])
-    if setup_scripts
-      setup_scripts.each do |script|
-        _run_setup_script(settings, script)
-      end
-    end
-
-
-
     ### START && run provision after start
     start_container(name, settings)
 
@@ -175,8 +163,20 @@ class Manager
   end
 
   def self.create_container(settings)
+    #puts "networks: #{settings['docker']['network']}"
     # create
-    cmd %Q(docker create --name #{settings.container_name} #{settings.docker_ports_string} #{settings.docker_volumes_string} #{settings.docker_volumes_from_string} #{settings.docker_links_string}  #{settings.run_extra_options_string} #{settings.run_env_variables_string} #{settings.image_name} #{settings['docker']['command']} #{settings['docker']['run_options']})
+    net_options = ""
+    networks = settings['docker'].fetch('network', {}).fetch('networks', [])
+    if networks && networks[0]
+      network = networks[0]
+      #puts "network=#{network}"
+      net_options << "--net #{network['net']} "
+      net_options << "--ip #{network['ip']} "  if network['ip']
+      net_options << "--mac-address #{network['mac_address']} "  if network['mac_address']
+    end
+
+
+    cmd %Q(docker create --name #{settings.container_name} #{net_options} #{settings.docker_ports_string} #{settings.docker_volumes_string} #{settings.docker_volumes_from_string} #{settings.docker_links_string}  #{settings.run_extra_options_string} #{settings.run_env_variables_string} #{settings.image_name} #{settings['docker']['command']} #{settings['docker']['run_options']})
   end
 
 
@@ -206,6 +206,17 @@ class Manager
 
 
   def self.start_container(name, settings)
+    ### BEFORE START
+
+    # run setup provision scripts
+    setup_scripts = (settings['provision']['setup'] rescue [])
+    if setup_scripts
+      setup_scripts.each do |script|
+        _run_setup_script(settings, script)
+      end
+    end
+
+
     # prepare before start
     prepare_before_start(settings)
 
@@ -243,7 +254,7 @@ class Manager
   def self.prepare_before_start(settings)
     puts "prepare_before_start"
 
-    #
+    # prepare for chef scripts
     bootstrap_scripts = (settings['provision']['bootstrap'] rescue [])
 
     # before start
@@ -271,7 +282,7 @@ class Manager
   def self.setup_container_after_start(settings)
 
     # default gateway
-=begin
+
     network = settings['docker']['network']
     if network
       gateway = network['default_gateway']
@@ -282,7 +293,7 @@ class Manager
         cmd %Q(docker exec #{settings.container_name} ip route change default via #{gateway})
       end
     end
-=end
+
 
 
     # fix hosts
@@ -350,6 +361,7 @@ class Manager
   end
 
   def self._run_bootstrap_script(settings, script)
+    puts "run bs script #{script}"
     if script['type']=='shell' && script['run_from']=='host'
       return _run_bootstrap_script_shell_from_host(settings, script)
     end

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.41"
+  VERSION = "0.1.43"
 end

data/readme.md

@@ -193,10 +193,11 @@ Process:
 * run provision to setup host machine. Script is running on the host machine.
 ```
 {   
-'install'=>
+'provision'=>[
     { 
         'host'=> {type: 'ruby', ..} 
-    }
+    },..
+    ]
     ...
 }
 ```
@@ -204,10 +205,12 @@ Process:
 * run provision to setup not running container. Run script which can copy/change files in container.
 ```
 {   
-'install'=>
+'provision'=>[
     { 
         'setup'=> {type: 'ruby'} 
-    }
+    },
+    ..
+    ]
     ...
 }
 ```
@@ -216,19 +219,21 @@ Process:
 Script should be located inside container.
 ```
 {   
-'install'=>
+'provision'=>[
     { 
         'bootstrap'=> {type: 'chef'} 
-    }
+    },..
+    ]
 ```
 
 * provision to init container. Run script every time after container starts. Script should be located inside container.
 ```
 {   
-'install'=>
+'provision'=>[
     { 
         'init'=> {type: 'chef'} 
-    }
+    },..
+    ]
 ```
 
 * Use lock file to make sure the container does not start until the provision is finished.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.43
 platform: ruby
 authors:
 - Max Ivak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-24 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler