docker-builder 0.1.48 → 0.1.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b2745682002c5bbb614ecaaf00c267cb6ab5ab1
-  data.tar.gz: fd19ce45603a0b753899c1e5e3f0ce7bccdd4488
+  metadata.gz: 0bec6fbf29026bca6f660a567d9d92917bc65186
+  data.tar.gz: 8cebb77981e72d3a567ccad40c2fa98c47c29226
 SHA512:
-  metadata.gz: 820e066e60b41b08936d9e43b02feca465ce6eb9e0dc6e638e0947b75350a94e535a128a79639a37b8a76e380b369aba3b858a5b2769284eebf6aebe0cb7dc2c
-  data.tar.gz: e1da706ff539680af5980baf1ba92d52625ec9f211d1284710ba9dc8133e0a3501a8c44d14bda3d299cf5135d7ee42ed167bbeda15404380e6c953614bd42df5
+  metadata.gz: 0838318189427168c736b4d5627b656874b4d713560b3fe211bd8c0415dab46918bf59ca946c94958dd12d66c2eb0bbd8c90b984dd6f6d85ce576857d014fe2d
+  data.tar.gz: 8e87ffd184c80d3109a60ef5adf45b643dc9a673daabf9dce46fc883f6ee1846a739592dd25c17eb1c899b514cebb9d4a85bac5c94ab4f713ba68a2dc3338c1e

data/install_local.sh

@@ -1,2 +1,2 @@
 gem build docker-builder.gemspec
-gem install ./docker-builder-0.1.48.gem
+gem install ./docker-builder-0.1.49.gem

data/lib/docker_builder/manager.rb

@@ -292,8 +292,6 @@ class Manager
   def self.setup_container_after_start(settings)
 
     # default gateway
-    puts "fix gateway"
-
     network = settings['docker']['network']
     if network
       gateway = network['default_gateway']
@@ -308,11 +306,7 @@ class Manager
 
 
     # fix hosts
-    puts "fix hosts"
-
     container_hosts = settings['docker']['hosts'] || []
-    puts "hosts: #{container_hosts}"
-    puts "docker settings : #{settings['docker']}"
     container_hosts.each do |r|
       #cmd %Q(docker exec #{settings.container_name} bash -c 'echo "#{r[0]} #{r[1]}" >>  /etc/hosts')
       cmd %Q(docker exec #{settings.container_name} sh -c 'echo "#{r[0]} #{r[1]}" >>  /etc/hosts')
@@ -322,6 +316,8 @@ class Manager
 
 
   def self.run_provision_after_start(settings)
+    puts "run_provision_after_start"
+
     # run bootstrap provision scripts
     bootstrap_scripts = (settings['provision']['bootstrap'] rescue [])
     if bootstrap_scripts
@@ -376,8 +372,12 @@ 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)
+    elsif script['type']=='shell' && (script['run_from'].nil? || script['run_from']=='')
+      _run_bootstrap_script_shell_in_container(settings, script)
     end
 
     return nil
@@ -390,7 +390,8 @@ class Manager
   end
 
 
-  def self.run_bootstrap_shell_script_in_container(settings, script_path)
+  def self._run_bootstrap_script_shell_in_container(settings, script)
+    script_path = script['script']
     # exec
     cmd %Q(docker exec #{settings.container_name} #{script_path} )
   end

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.48"
+  VERSION = "0.1.49"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.48
+  version: 0.1.49
 platform: ruby
 authors:
 - Max Ivak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Docker builder