docker-builder 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64818dcd8a002f703ad3e8815a65b41f41b982fa
-  data.tar.gz: b5fc7a84041278996604d286c6391e0d26ae83b5
+  metadata.gz: fba8f83b9c7389ce1def0e2d8640908a444b3faa
+  data.tar.gz: e43ce00f5d0087ea229a8be8572f9cdb0a67be62
 SHA512:
-  metadata.gz: 797b8478d848233a699374827abe591cc8674a43fed256abd4f9e4e32c3b5946e3cbba4ba56308a199a1d791d69c157c9ab8c731a04ccc36a6837a71565ad4ca
-  data.tar.gz: c16f17c1625468db57cd685e16bd567d3ec2da81f7fb55422141ad4a7766a8b2475fc965c5789662adffbe47260a3fd4655db3a22b9e8ff70c0185e0bfb8628e
+  metadata.gz: 23acf7785ceeccda6beddf952d7aea52c72cab08ba128d744023fb633934ee55d4cb1f059234ed7946a4bbd806742ac114c8caaf7fc201e1bc4d5962dc0e896d
+  data.tar.gz: 52f6557823176384be710dd7e4bbfde9664562e6acbcd3e72e58878e4e17866488578dea896ca9752651c18ec7be857f178b44e277cc4f95d1558de224e76110

data/lib/docker_builder/manager.rb

@@ -64,6 +64,10 @@ class Manager
     puts "creating and running container.."
     #settings = load_settings(server_name)
 
+    # destroy
+    destroy_container(server_name, settings)
+
+
     # provision host before running container
     res_install = _install_container_provision_host(settings)
 
@@ -244,9 +248,6 @@ class Manager
     #
     cmd %Q(cd #{Config.root_path} && chef exec knife node delete #{settings.chef_node_name}  -y -c #{chef_config_knife_path})
 
-    #cmd %Q(SERVER_NAME=#{settings.name} chef-client -z -N #{settings.name} chef_destroy_image.rb)
-    #cmd %Q(SERVER_NAME=#{settings.name} SERVER_PATH=#{settings.dir_server_root} chef exec chef-client -z -N #{settings.image_name} -j #{settings.filename_config_json} -c #{chef_config_knife_path} #{chef_recipe_path('chef_destroy_image.rb')} )
-
     res_recipe = run_chef_recipe(settings, 'chef_destroy_image.rb')
 
     chef_remove_data(settings)
@@ -284,6 +285,9 @@ class Manager
 
 
   def self.destroy_container_chef(settings)
+    # destroy temp container
+    cmd %Q(docker rm -f chef-converge.#{settings.image_name} )
+
     #
     res_chef = run_chef_recipe(settings, 'chef_destroy_container.rb')
     #cmd %Q(SERVER_NAME=#{settings.name} chef-client -z -N #{settings.name} chef_destroy_container.rb)

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

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