docker-builder 0.1.37 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2255579f59a5cfe1a5e1d927c00aee8b7f1202b9
-  data.tar.gz: 0dfee3c6a95987db55800c0228d71febf642afda
+  metadata.gz: 63eb356b5708d5b8e8ced37c1e15e4d7d14f398b
+  data.tar.gz: 5b57b4dae9c1d1b5f89632766d9231190dfcb97e
 SHA512:
-  metadata.gz: fe2cbc5967ce7caf926dcf6cad392046152951cf5f5d04592c5def566c4f3bd3a96e557ba96cabdd70e2f209bd02e9f20ba5bfa30e729987cfb820f00c96c9b7
-  data.tar.gz: 4e68e3eba7c39406cadfc2df886507c826dd603335940a4778267934dfc1ad8cf58207e9f7a923dfdbda465ff11f5b1c1568d0574730470c6a8252b9d6e32500
+  metadata.gz: f3788f2a6a2fd7b557c659c377f18c0395a3a463348f19cd93930fafa330537327178b97a9027ddd6ddea462dba1db46903688aa836ac21b23c9e0b6b2a74ee9
+  data.tar.gz: ac143ecd8d1c3d712660f46ed49539e4c17f749d04effe5961429de8e29ef6e6e847e65a9baa84a50d6315d934835c6d7f78f3ac84444bb12a1d939896c3e1e3

data/install_local.sh

@@ -1,2 +1,2 @@
 gem build docker-builder.gemspec
-gem install ./docker-builder-0.1.37.gem
+gem install ./docker-builder-0.1.38.gem

data/lib/docker_builder/builder/packer.rb

@@ -54,7 +54,7 @@ module DockerBuilder
 
         res['builders'] = []
 
-        bi = settings.attributes['build']['base_image']
+        bi = settings.properties['build']['base_image']
         base_image_name = "#{bi['name']}:#{bi['tag']}"
         builder1 = {
             pull: false,
@@ -64,7 +64,7 @@ module DockerBuilder
         }
 
         # changes
-        entrypoint = settings.attributes['build']['entrypoint']
+        entrypoint = settings.properties['build']['entrypoint']
         if entrypoint
           builder1['changes'] ||= []
           builder1['changes'] << "ENTRYPOINT #{entrypoint}"
@@ -82,7 +82,7 @@ module DockerBuilder
                 type: "chef-solo",
                 prevent_sudo: true,
                 cookbook_paths: cookbook_paths,
-                json: settings.attributes['attributes'],
+                json: settings.properties['attributes'],
                 run_list: ["recipe[#{settings.name}::#{recipe_name}]"]
           },
         ]

data/lib/docker_builder/manager.rb

@@ -30,7 +30,7 @@ class Manager
   def self.build_image(server_name, settings=nil)
     puts "building image for #{server_name}..."
     #puts "settings: #{settings}"
-    #puts "debug: #{settings['attributes']}"
+    #puts "debug: #{settings['properties']}"
 
     #settings = load_settings(server_name)
 
@@ -169,15 +169,6 @@ class Manager
     end
 
 
-    # ??? TODO: remove it ?
-    # run some provision scripts - for chef
-    bootstrap_type = (settings['install']['bootstrap']['type'] rescue nil)
-
-    # before start
-    if bootstrap_type && bootstrap_type=='chef'
-      _bootstrap_container_prepare(settings)
-    end
-
 
     ### START && run provision after start
     start_container(name, settings)
@@ -217,6 +208,11 @@ class Manager
 
 
   def self.start_container(name, settings)
+    # prepare before start
+    prepare_before_start(settings)
+
+
+
     # start
     cmd %Q(docker start #{settings.container_name})
 
@@ -246,6 +242,34 @@ class Manager
     assert res, "Container #{container_name} is not running"
   end
 
+  def self.prepare_before_start(settings)
+    puts "prepare_before_start"
+
+    #
+    bootstrap_scripts = (settings['provision']['bootstrap'] rescue [])
+
+    # before start
+    if bootstrap_scripts
+      bootstrap_scripts.each do |script|
+        if script['type']=='chef'
+          _prepare_provision_before_start_chef(settings, script)
+        end
+      end
+    end
+
+  end
+
+  def self._prepare_provision_before_start_chef(settings, script)
+    puts "_prepare_provision_before_start_chef"
+
+    require_relative '../../lib/docker_builder/provisioner/provisioner_chef'
+
+    provisioner = DockerBuilder::Provisioner::ProvisionerChef.new(settings)
+    provisioner.copy_config_file
+
+  end
+
+
   def self.setup_container_after_start(settings)
 
     # default gateway
@@ -387,13 +411,7 @@ class Manager
   end
 
 
-  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}"

data/lib/docker_builder/manager_swarm.rb

@@ -23,7 +23,7 @@ module DockerBuilder
       create_volumes_dirs(settings)
 
       # create service
-      docker_opts = settings.attributes['docker']
+      docker_opts = settings.properties['docker']
 
       run_opts = []
       run_opts << "--network #{docker_opts['swarm_network']}" if docker_opts['swarm_network']

data/lib/docker_builder/provisioner/provisioner_chef.rb

@@ -53,7 +53,7 @@ module DockerBuilder
       def build_config
         res = {}
 
-        attr = settings.attributes['attributes']
+        attr = settings.properties['attributes']
         res = attr
 
         #res = settings.all_attributes

data/lib/docker_builder/temp.rb

@@ -0,0 +1 @@
+

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.37"
+  VERSION = "0.1.38"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.38
 platform: ruby
 authors:
 - Max Ivak
@@ -154,6 +154,7 @@ files:
 - lib/docker_builder/manager_swarm.rb
 - lib/docker_builder/provisioner/provisioner_chef.rb
 - lib/docker_builder/server_settings.rb
+- lib/docker_builder/temp.rb
 - lib/docker_builder/version.rb
 - lib/templates/example-chef/.chef/knife.rb
 - lib/templates/example-chef/config.rb.erb