docker-builder 0.1.33 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd4b02bc0d223535a4517d0b8f49ceaa1793ccdb
-  data.tar.gz: 233dab49244603077dd0be1929993aedcf8a40f9
+  metadata.gz: 14f1c7d7ca377f0eb931226a79fb56e29c3ca6ef
+  data.tar.gz: 26794a1d0cef7af4b351be358e78e77d4ad2800c
 SHA512:
-  metadata.gz: 44c1394885079ef282c8732e61ec409995d21172193fe1554836cc2d609e278700d75d2ed8b13f5da04ba8bee80da25db98a52014959a04d14c975fe90508026
-  data.tar.gz: 0f6396ff78d97b8dc1f2c2995f7f05aa5ed456947be44b9c2abb9d0c1273270a2f18e2f981697f63a9c0b946c2b6149b65a984c1766eb78aaf3cfe069d871f3c
+  metadata.gz: f8638d3631950819b5b27a9c7f6aa186e1d59bac1a7b63b5b85653f35df41afa5ba782f1ee83a560f0479e931be519ded6860bf752ce6e28c1864d5b5505d3dc
+  data.tar.gz: 035d9f135523e511775449d90e6b080727222b7eef2c5efd18fa971c2c1f746eedbdde50ee2d32e4e32d3cf451a320f628c31eb3464cc45d6e5b6549f1957a18

data/install_local.sh

@@ -1,2 +1,2 @@
 gem build docker-builder.gemspec
-gem install ./docker-builder-0.1.32.gem
+gem install ./docker-builder-0.1.34.gem

data/lib/docker_builder/manager.rb

@@ -186,12 +186,8 @@ class Manager
   end
 
   def self.create_container(settings)
-    #cmd %Q(docker run -d --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']})
-
     # 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']})
-
-
   end
 
 
@@ -278,7 +274,19 @@ class Manager
 
 
   def self.run_provision_after_start(settings)
+    # run bootstrap provision scripts
+    bootstrap_scripts = (settings['provision']['bootstrap'] rescue [])
+    if bootstrap_scripts
+      bootstrap_scripts.each do |script|
+        _run_bootstrap_script(settings, script)
+      end
+    end
+
 
+=begin
+# commented - 2017-02-22
+
+    #
     install_node_script_type = (settings['install']['node']['script_type'] rescue nil)
     install_bootstrap_script = (settings['install']['bootstrap']['script'] rescue nil)
 
@@ -312,11 +320,27 @@ class Manager
       # bootstsrap with shell script
       run_bootstrap_shell_script_in_container(settings, install_bootstrap_script)
     end
+=end
+
 
 
     true
   end
 
+  def self._run_bootstrap_script(settings, script)
+    if script['type']=='shell' && script['run_from']=='host'
+      return _run_bootstrap_script_shell_from_host(settings, script)
+    end
+
+    return nil
+  end
+
+
+  def self._run_bootstrap_script_shell_from_host(settings, script)
+    cmd %Q(cd #{settings.dir_server_root} && #{script['script']} )
+
+  end
+
 
   def self.run_bootstrap_shell_script_in_container(settings, script_path)
     # exec
@@ -352,16 +376,14 @@ class Manager
 
   def self._run_setup_script(settings, script)
     if script['type']=='shell'
-      return _run_setup_script_shell(settings, script)
+      return _run_setup_script_shell_from_host(settings, script)
     end
 
     return nil
   end
 
-  def self._run_setup_script_shell(settings, script)
-    #
+  def self._run_setup_script_shell_from_host(settings, script)
     cmd %Q(cd #{settings.dir_server_root} && #{script['script']} )
-
   end
 
 

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.33"
+  VERSION = "0.1.34"
 end

data/readme.md

@@ -344,6 +344,25 @@ docker exec -ti container_name /bin/bash
 
 
 
+
+# Provision
+
+## Run provision after start
+
+### Run provision from host machine
+
+Run from outside container
+
+```
+'provision' => {
+    "bootstrap" => [
+        {'type' => 'shell', 'run_from'=>'host', 'script'=>'name=myserver ruby myprovision1.rb'     }
+    ]
+}
+    
+```
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.34
 platform: ruby
 authors:
 - Max Ivak