docker-builder 0.1.55 → 0.1.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 900f989de3f0c47d40b6494a9e419acd6ca42324
-  data.tar.gz: 491ee67ea44c3564aed1c1492b9f79198a69f9ef
+  metadata.gz: 73d503e285abeee2dde62729f89b3052a5378965
+  data.tar.gz: af9eb9163dc809a4046fed5e0b7999af09101583
 SHA512:
-  metadata.gz: 9613b5f3f6800d10c304ce9684dba601eab390abf7eec04f33db24893b390910bd2a59b5335dba6940b0e58029dd9cbe0c750923b2fff58e36636daba161d19c
-  data.tar.gz: 02022477d3b197ab3a17100fecffdda1542db020637af80b7b0d728bbbb86c1e21b0c9a6472f2a9b265876279a93128e28c7ba1a0c98f88e60b29ddb363985e6
+  metadata.gz: ccb9c7f00f642fc912baa4930a39f0a85fd096d836e2668ced36750b99edabdfe29d913cdfcbd4a28899e3162ab56cde8b9761d982df1f4e40a323a09cfbe6fd
+  data.tar.gz: fb0933c4429834b19dbfbb31b14a30c38e6f7511a6df1ed1338e27f11b007af869ef920362c53589198ff15316427a8b3886a53f21720aa2d3fa9b6b239c7a47

data/install_local.sh

@@ -1,2 +1,2 @@
 gem build docker-builder.gemspec
-gem install ./docker-builder-0.1.54.gem
+gem install ./docker-builder-0.1.57.gem

data/lib/docker_builder/provisioner/base.rb

@@ -65,106 +65,94 @@ module DockerBuilder
 
     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)
-      elsif script['type']=='chef'
-        # TODO: do it
-        _run_bootstrap_script_chef(settings, script)
-      end
 
-      return nil
-    end
 
 
     ### provision - setup
 
     def self._run_setup_script(settings, script)
       puts "run script #{script}"
+
       if script['type']=='shell'
-        return _run_setup_script_shell_from_host(settings, script)
+        return _run_setup_script_on_host_shell(settings, script)
+      elsif script['type']=='chef'
+        return _run_setup_script_on_host_chef(settings, script)
       end
 
       return nil
     end
 
-    def self._run_setup_script_shell_from_host(settings, script)
+    def self._run_setup_script_on_host_shell(settings, script)
       cmd %Q(cd #{settings.dir_server_root} && #{script['script']} )
     end
 
+    def self._run_setup_script_on_host_chef(settings, script)
+      raise 'NOT implemented'
 
-    def self._provision_container_chef_recipe(settings)
-      puts "provisioning container #{settings.container_name}"
-
-      #cmd %Q(SERVER_NAME=#{settings.name} chef-client -z -N #{settings.name} #{settings.name}/cookbooks/#{settings.name}/ )
-    end
+      # run script on host machine
+      script_name = settings['install']['host']['script'] || 'install_host'
 
+      # check script exists
+      #script_path = "#{settings.name}/cookbooks/#{settings.name}/recipes/#{script_name}.rb"
+      #f = File.expand_path('.', script_path)
 
+      #if !File.exists?(f)
+      #  puts "script not found: #{f}. Skipping"
+      #  return false
+      #end
 
-    ### provision - bootstrap
+      #puts "pwd= #{Dir.pwd}"
+      #puts "root = #{Config.root_path}"
+      #exit
 
-    def self._run_bootstrap_script_shell_from_host(settings, script)
-      cmd %Q(cd #{settings.dir_server_root} && #{script['script']} )
+      #
 
+      return true
     end
 
 
-    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
 
-=begin
-def self._install_container_provision_host(settings)
-    script_type = (settings['install']['host']['script_type'] rescue nil)
-    return true unless script_type
 
-    # run provision script on the host machine
-    if script_type=='chef_recipe'
-      return _install_container_provision_host_chef_recipe(settings)
-    else
-      # do nothing
+    ### provision - bootstrap
+
+    def self._run_bootstrap_script(settings, script)
+      puts "run BS script #{script}"
+
+      if script['type']=='shell' && script['run_from']=='host'
+        return _run_bootstrap_script_on_host_shell(settings, script)
+      elsif script['type']=='shell' && (script['run_from'].nil? || script['run_from']=='')
+        _run_bootstrap_script_in_container_shell(settings, script)
+      elsif script['type']=='chef'
+        _run_bootstrap_script_in_container_chef(settings, script)
+      end
+
+      return nil
     end
 
-    true
-  end
 
-  #
-  def self._install_container_provision_host_chef_recipe(settings)
-    # run script on host machine
-    script_name = settings['install']['host']['script'] || 'install_host'
+    def self._run_bootstrap_script_on_host_shell(settings, script)
+      cmd %Q(cd #{settings.dir_server_root} && #{script['script']} )
 
-    # check script exists
-    #script_path = "#{settings.name}/cookbooks/#{settings.name}/recipes/#{script_name}.rb"
-    #f = File.expand_path('.', script_path)
+    end
 
-    #if !File.exists?(f)
-    #  puts "script not found: #{f}. Skipping"
-    #  return false
-    #end
 
-    #puts "pwd= #{Dir.pwd}"
-    #puts "root = #{Config.root_path}"
-    #exit
+    def self._run_bootstrap_script_in_container_shell(settings, script)
+      script_path = script['script']
 
-    #
-    res_chef = run_chef_recipe_server_recipe(settings, script_name)
-    #cmd %Q(SERVER_NAME=#{settings.name} chef-client -z -N #{settings.name} --override-runlist 'recipe[#{settings.name}::#{script_name}]' )
+      # exec
+      cmd %Q(docker exec #{settings.container_name} #{script_path} )
+    end
 
-    return true
-  end
+    def self._run_bootstrap_script_in_container_chef(settings, script)
+      req = DockerBuilder::Provisioner::Chef.new(settings)
+      return req.run_recipe_in_container script['dir_base'], script['recipe_name']
+    end
 
 
-=end
 
     ### helpers - shell
 
-    def self.run_shell_script_in_container(settings, script_name)
+    def self.run_script_in_container_shell(settings, script_name)
       script_path = settings.make_path_full("scripts/#{script_name}")
 
       # copy
@@ -176,6 +164,9 @@ def self._install_container_provision_host(settings)
     end
 
 
+
+
+
     ###
     def self.cmd(s)
       Command.cmd(s)

data/lib/docker_builder/provisioner/chef.rb

@@ -30,11 +30,10 @@ module DockerBuilder
         save_config
 
         # copy to container
-        DockerBuilder::Command.cmd %Q(docker cp #{filename_config} #{settings.container_name}:/opt/bootstrap/config.json)
+        DockerBuilder::Command.cmd %Q(docker cp #{filename_config} #{settings.container_name}:#{docker_filename_config})
 
       end
 
-      # helpers
       def save_config
         require 'json'
         filename = filename_config
@@ -50,6 +49,10 @@ module DockerBuilder
         File.join(Config.root_path, 'temp', "bootstrap-#{settings.name}.json")
       end
 
+      def docker_filename_config
+        "/opt/bootstrap/config.json"
+      end
+
       def build_config
         res = {}
 
@@ -63,7 +66,25 @@ module DockerBuilder
 
 
       ### run recipes
+      def run_recipe_in_container(dir_base, recipe_name)
+
+        recipe_name ||= "server::bootstrap"
+
+        # generate config
+        copy_config_file
+
 
+        #
+        q = %Q(cd #{dir_base} && chef-client -z -j #{docker_filename_config} --override-runlist "recipe[#{recipe_name}]" )
+
+        # exec
+        docker_run_cmd q
+      end
+
+      ###
+      def docker_run_cmd(s)
+        DockerBuilder::Command.cmd %Q(docker exec #{settings.container_name} bash -c '#{s}')
+      end
 
     end
   end

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.55"
+  VERSION = "0.1.57"
 end

data/readme.md

@@ -195,7 +195,7 @@ Process:
 {   
 'provision'=>{
     'setup' => [
-        {type: 'host', ..}, 
+        {type: 'shell', ..}, 
         ..
     ]
     ...
@@ -357,6 +357,8 @@ docker exec -ti container_name /bin/bash
 
 # Provision
 
+
+
 ## Run provision after start
 
 ### Run provision from host machine
@@ -375,6 +377,27 @@ Run from outside container
 it will run script `name=myserver ruby myprovision1.rb` from the host machine.
 
 
+### Provision with Chef
+
+* in config file
+```
+    'provision' => {
+        "bootstrap" => [
+            {'type' => 'chef', "script"=>"", "dir_base"=>"/opt/bootstrap", "recipe"=>"server::bootstrap" },
+        ]
+    },
+```
+
+it will run chef provisioning:
+```
+cd /opt/bootstrap/ && chef-client -z -j /opt/bootstrap/config.json --override-runlist "recipe[server::bootstrap]"
+
+```
+
+config file with attributes (`/opt/bootstrap/config.json`) for chef-client is generated automatically.
+
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. 

metadata

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