docker-builder 0.1.28 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 960492c3b515b4715ff15e100ee08035c57329d1
-  data.tar.gz: e7ca4c753cea3e9edd071e903bece0b942063dc1
+  metadata.gz: 25b87b6681068503f2f6d0d8ec3d6173e0af7381
+  data.tar.gz: c18e85a54b8be929901184b925df68a0d9d7fd8a
 SHA512:
-  metadata.gz: d6b7a4739370484ccad9bd2aad9bc090e7bd80595e076d5ed84e5dc0760d2e4d49b5f8a3f3d5efd25881f8f9bf5afa4e4a4b1f005b89da3b8f2a7e1e78893bfd
-  data.tar.gz: 026fd20d3d2b3781beb1afb2dd3df56456c825f1274f48c7226cf687f91c290b19956f2418f4494f67226f39f648485a67cc46c0328004fd98dac1a8969cc5ca
+  metadata.gz: 63ed4d061457d2d857759c42bce8e9997a0ca0d632232a2681441db91cbbc7465e64a8ee06d322aa47e63442f692e3cd7a8aba71a68536657543e84a406e9b58
+  data.tar.gz: 44f5c0cfbb9fbe3871f0160095dc4efb9e82ac3e96ebcbff696f4cca40b261d3849728bd680c79c4f8ced2b6a6df98803463ac0fab227dfa22e4d21499bd1ad7

data/install_local.sh

@@ -1,2 +1,2 @@
 gem build docker-builder.gemspec
-gem install ./docker-builder-0.1.27.gem
+gem install ./docker-builder-0.1.29.gem

data/lib/docker_builder/manager.rb

@@ -136,7 +136,6 @@ class Manager
   def self._run_container(settings)
     puts "run container ..."
 
-    install_node_script_type = (settings['install']['node']['script_type'] rescue nil)
     bootstrap_type = (settings['install']['bootstrap']['type'] rescue nil)
 
     #
@@ -153,6 +152,8 @@ class Manager
 
 
     # provision after start
+    install_node_script_type = (settings['install']['node']['script_type'] rescue nil)
+    install_bootstrap_script_type = (settings['install']['bootstrap']['script_type'] rescue nil)
 
     if install_node_script_type && install_node_script_type=='chef_recipe'
       # run container and provision with chef
@@ -177,6 +178,14 @@ class Manager
 
     end
 
+    # bootstrap
+    if install_bootstrap_script_type && install_bootstrap_script_type=='shell'
+      script = settings['install']['bootstrap']['script'] || '/opt/bootstrap/bootstrap.sh'
+
+      # bootstsrap with shell script
+      run_bootsrap_shell_script_in_container(settings, script)
+    end
+
 
     true
   end
@@ -204,6 +213,14 @@ class Manager
     setup_container_after_start(settings)
   end
 
+
+  def self.run_bootsrap_shell_script_in_container(settings, script_path)
+    # exec
+    cmd %Q(docker exec #{settings.container_name} #{script_path} )
+  end
+
+
+
   def self.setup_container_after_start(settings)
     # second network
     network2 = settings['docker']['network_secondary']

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.28"
+  VERSION = "0.1.29"
 end

metadata

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