docker-builder 0.1.14 → 0.1.15
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/docker_builder/manager.rb +7 -3
- data/lib/docker_builder/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fba8f83b9c7389ce1def0e2d8640908a444b3faa
|
4
|
+
data.tar.gz: e43ce00f5d0087ea229a8be8572f9cdb0a67be62
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 23acf7785ceeccda6beddf952d7aea52c72cab08ba128d744023fb633934ee55d4cb1f059234ed7946a4bbd806742ac114c8caaf7fc201e1bc4d5962dc0e896d
|
7
|
+
data.tar.gz: 52f6557823176384be710dd7e4bbfde9664562e6acbcd3e72e58878e4e17866488578dea896ca9752651c18ec7be857f178b44e277cc4f95d1558de224e76110
|
@@ -64,6 +64,10 @@ class Manager
|
|
64
64
|
puts "creating and running container.."
|
65
65
|
#settings = load_settings(server_name)
|
66
66
|
|
67
|
+
# destroy
|
68
|
+
destroy_container(server_name, settings)
|
69
|
+
|
70
|
+
|
67
71
|
# provision host before running container
|
68
72
|
res_install = _install_container_provision_host(settings)
|
69
73
|
|
@@ -244,9 +248,6 @@ class Manager
|
|
244
248
|
#
|
245
249
|
cmd %Q(cd #{Config.root_path} && chef exec knife node delete #{settings.chef_node_name} -y -c #{chef_config_knife_path})
|
246
250
|
|
247
|
-
#cmd %Q(SERVER_NAME=#{settings.name} chef-client -z -N #{settings.name} chef_destroy_image.rb)
|
248
|
-
#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')} )
|
249
|
-
|
250
251
|
res_recipe = run_chef_recipe(settings, 'chef_destroy_image.rb')
|
251
252
|
|
252
253
|
chef_remove_data(settings)
|
@@ -284,6 +285,9 @@ class Manager
|
|
284
285
|
|
285
286
|
|
286
287
|
def self.destroy_container_chef(settings)
|
288
|
+
# destroy temp container
|
289
|
+
cmd %Q(docker rm -f chef-converge.#{settings.image_name} )
|
290
|
+
|
287
291
|
#
|
288
292
|
res_chef = run_chef_recipe(settings, 'chef_destroy_container.rb')
|
289
293
|
#cmd %Q(SERVER_NAME=#{settings.name} chef-client -z -N #{settings.name} chef_destroy_container.rb)
|