docker-builder 0.1.26 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb25008d4f2f9e81b4cb3838fa9aaf50836061fe
-  data.tar.gz: 1a41a6e5f930d7b5904ff0104afabf11e546b776
+  metadata.gz: 960492c3b515b4715ff15e100ee08035c57329d1
+  data.tar.gz: e7ca4c753cea3e9edd071e903bece0b942063dc1
 SHA512:
-  metadata.gz: af7cf7a928edc1de2fe7ea1c2e871c7b1ec2b1fdfa0f139553e8bc14f5c53e8464bb991a8acc69e8f57c17fa9928a3815926ad4cace66f5495197668a0f28f05
-  data.tar.gz: f0f127dd2eb74cc3dcfd241a45285b1599fd17f4005385bcf17c97201eb89ef6d3a6862712c65304c2f7a73cc4c9cd3c0378c255e4de480aafde073fc711d1f1
+  metadata.gz: d6b7a4739370484ccad9bd2aad9bc090e7bd80595e076d5ed84e5dc0760d2e4d49b5f8a3f3d5efd25881f8f9bf5afa4e4a4b1f005b89da3b8f2a7e1e78893bfd
+  data.tar.gz: 026fd20d3d2b3781beb1afb2dd3df56456c825f1274f48c7226cf687f91c290b19956f2418f4494f67226f39f648485a67cc46c0328004fd98dac1a8969cc5ca

data/install_local.sh

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

data/lib/docker_builder/builder/packer.rb

@@ -56,12 +56,21 @@ module DockerBuilder
 
         bi = settings.attributes['build']['base_image']
         base_image_name = "#{bi['name']}:#{bi['tag']}"
-        res['builders'] << {
-                pull: false,
-                type: "docker",
-                image: base_image_name,
-                commit: true
-            }
+        builder1 = {
+            pull: false,
+            type: "docker",
+            image: base_image_name,
+            commit: true
+        }
+
+        # changes
+        entrypoint = settings.attributes['build']['entrypoint']
+        if entrypoint
+          builder1['changes'] ||= []
+          builder1['changes'] << "ENTRYPOINT #{entrypoint}"
+        end
+
+        res['builders'] << builder1
 
         #
         recipe_name = settings['build']['packer']['recipe_name'] || 'build'

data/lib/docker_builder/manager.rb

@@ -136,20 +136,34 @@ class Manager
   def self._run_container(settings)
     puts "run container ..."
 
-    script_type = (settings['install']['node']['script_type'] rescue nil)
+    install_node_script_type = (settings['install']['node']['script_type'] rescue nil)
+    bootstrap_type = (settings['install']['bootstrap']['type'] rescue nil)
+
+    #
+    create_container(settings)
+
+    # before start
+    if bootstrap_type && bootstrap_type=='chef'
+      _bootstrap_container_prepare(settings)
+    end
+
+
+    # start
+    start_container(settings)
 
-    puts "script type: #{script_type}"
 
+    # provision after start
 
-    if script_type && script_type=='chef_recipe'
+    if install_node_script_type && install_node_script_type=='chef_recipe'
       # run container and provision with chef
-      _run_container_chef(settings)
+      #_run_container_chef(settings)
 
       # ???
       #_provision_container_chef_recipe(settings)
-    elsif script_type && script_type=='shell'
+
+    elsif install_node_script_type && install_node_script_type=='shell'
       # docker run
-      create_and_run_container(settings)
+      #create_and_run_container(settings)
 
       # provision with shell script
       run_shell_script_in_container(settings, "install.sh")
@@ -159,14 +173,15 @@ class Manager
       #_run_container_docker(settings)
 
       # docker run
-      create_and_run_container(settings)
+      #create_and_run_container(settings)
 
     end
 
+
     true
   end
 
-  def self.create_and_run_container(settings)
+  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
@@ -179,10 +194,20 @@ class Manager
       s_ip = "--ip #{ip}" if ip
       cmd %Q(docker network connect #{s_ip}  #{network2['net']} #{settings.container_name})
     end
+  end
 
+  def self.start_container(settings)
     # start
     cmd %Q(docker start #{settings.container_name})
 
+    # setup
+    setup_container_after_start(settings)
+  end
+
+  def self.setup_container_after_start(settings)
+    # second network
+    network2 = settings['docker']['network_secondary']
+
     # fixes
     if network2
       gateway = network2['gateway']
@@ -195,10 +220,8 @@ class Manager
     end
 
     # fix hosts
-    puts "fix hosts"
     container_hosts = settings['docker']['hosts'] || []
     container_hosts.each do |r|
-      puts "fix host #{r[0]} #{r[1]}"
       #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')
     end
@@ -229,6 +252,14 @@ class Manager
 
   ### provision
 
+  def self._bootstrap_container_prepare(settings)
+    require_relative '../../lib/docker_builder/provisioner/provisioner_chef'
+
+    provisioner = DockerBuilder::Provisioner::ProvisionerChef.new(settings)
+    provisioner.copy_config_file
+
+  end
+
   def self._provision_container_chef_recipe(settings)
     puts "provisioning container #{settings.container_name}"
 
@@ -334,14 +365,6 @@ class Manager
   end
 
 
-  def self.start_container(server_name)
-    settings = load_settings(server_name)
-
-    #
-    cmd %Q(docker start #{settings.container_name} )
-
-    return true
-  end
 
 
   ### stop container

data/lib/docker_builder/provisioner/provisioner_chef.rb

@@ -0,0 +1,68 @@
+module DockerBuilder
+  module Provisioner
+    class ProvisionerChef
+
+      attr_accessor :server
+
+      def server=(v)
+        @server = v
+        @server
+      end
+
+      def server
+        @server
+      end
+
+      def settings
+        server
+      end
+
+
+      def initialize(_settings)
+        self.server = _settings
+
+      end
+
+      ###
+
+      def copy_config_file
+        # config json
+        save_config
+
+        # copy to container
+        DockerBuilder::Command.cmd %Q(docker cp #{filename_config} #{settings.container_name}:/opt/bootstrap/config.json)
+
+      end
+
+      # helpers
+      def save_config
+        require 'json'
+        filename = filename_config
+        FileUtils.mkdir_p(File.dirname(filename))
+        File.open(filename,"w+") do |f|
+          f.write(build_config.to_json)
+        end
+
+        true
+      end
+
+      def filename_config
+        File.join(Config.root_path, 'temp', "bootstrap-#{settings.name}.json")
+      end
+
+      def build_config
+        res = {}
+
+        attr = settings.attributes['attributes']
+        res = attr
+
+        #res = settings.all_attributes
+
+        res
+      end
+
+    end
+  end
+end
+
+

data/lib/docker_builder/version.rb

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

data/readme.md

@@ -566,3 +566,21 @@ my-test-redis
 
     
 
+
+# Bootstrap
+
+* first provision of container
+
+
+## Provision with chef
+
+docker-builder up -s server_name
+
+Process:
+* docker create with docker options
+    * entrypoint: /etc/bootstrap
+* generate config with node attributes for chef and save it to temp/boostrap-__server__.json
+* copy config file to container to /opt/bootstrap/config.json
+* docker start 
+* when container starts it runs /etc/boostrap which
+    * runs chef-client to provision server first time

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.28
 platform: ruby
 authors:
 - Max Ivak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -152,6 +152,7 @@ files:
 - lib/docker_builder/cookbooks/docker-builder/resources/mycontainer.rb
 - lib/docker_builder/manager.rb
 - lib/docker_builder/manager_swarm.rb
+- lib/docker_builder/provisioner/provisioner_chef.rb
 - lib/docker_builder/server_settings.rb
 - lib/docker_builder/version.rb
 - lib/templates/example-chef/.chef/knife.rb