docker-builder 0.1.33 → 0.1.34

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: dd4b02bc0d223535a4517d0b8f49ceaa1793ccdb
4
- data.tar.gz: 233dab49244603077dd0be1929993aedcf8a40f9
3
+ metadata.gz: 14f1c7d7ca377f0eb931226a79fb56e29c3ca6ef
4
+ data.tar.gz: 26794a1d0cef7af4b351be358e78e77d4ad2800c
5
5
  SHA512:
6
- metadata.gz: 44c1394885079ef282c8732e61ec409995d21172193fe1554836cc2d609e278700d75d2ed8b13f5da04ba8bee80da25db98a52014959a04d14c975fe90508026
7
- data.tar.gz: 0f6396ff78d97b8dc1f2c2995f7f05aa5ed456947be44b9c2abb9d0c1273270a2f18e2f981697f63a9c0b946c2b6149b65a984c1766eb78aaf3cfe069d871f3c
6
+ metadata.gz: f8638d3631950819b5b27a9c7f6aa186e1d59bac1a7b63b5b85653f35df41afa5ba782f1ee83a560f0479e931be519ded6860bf752ce6e28c1864d5b5505d3dc
7
+ data.tar.gz: 035d9f135523e511775449d90e6b080727222b7eef2c5efd18fa971c2c1f746eedbdde50ee2d32e4e32d3cf451a320f628c31eb3464cc45d6e5b6549f1957a18
@@ -1,2 +1,2 @@
1
1
  gem build docker-builder.gemspec
2
- gem install ./docker-builder-0.1.32.gem
2
+ gem install ./docker-builder-0.1.34.gem
@@ -186,12 +186,8 @@ class Manager
186
186
  end
187
187
 
188
188
  def self.create_container(settings)
189
- #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']})
190
-
191
189
  # create
192
190
  cmd %Q(docker create --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']})
193
-
194
-
195
191
  end
196
192
 
197
193
 
@@ -278,7 +274,19 @@ class Manager
278
274
 
279
275
 
280
276
  def self.run_provision_after_start(settings)
277
+ # run bootstrap provision scripts
278
+ bootstrap_scripts = (settings['provision']['bootstrap'] rescue [])
279
+ if bootstrap_scripts
280
+ bootstrap_scripts.each do |script|
281
+ _run_bootstrap_script(settings, script)
282
+ end
283
+ end
284
+
281
285
 
286
+ =begin
287
+ # commented - 2017-02-22
288
+
289
+ #
282
290
  install_node_script_type = (settings['install']['node']['script_type'] rescue nil)
283
291
  install_bootstrap_script = (settings['install']['bootstrap']['script'] rescue nil)
284
292
 
@@ -312,11 +320,27 @@ class Manager
312
320
  # bootstsrap with shell script
313
321
  run_bootstrap_shell_script_in_container(settings, install_bootstrap_script)
314
322
  end
323
+ =end
324
+
315
325
 
316
326
 
317
327
  true
318
328
  end
319
329
 
330
+ def self._run_bootstrap_script(settings, script)
331
+ if script['type']=='shell' && script['run_from']=='host'
332
+ return _run_bootstrap_script_shell_from_host(settings, script)
333
+ end
334
+
335
+ return nil
336
+ end
337
+
338
+
339
+ def self._run_bootstrap_script_shell_from_host(settings, script)
340
+ cmd %Q(cd #{settings.dir_server_root} && #{script['script']} )
341
+
342
+ end
343
+
320
344
 
321
345
  def self.run_bootstrap_shell_script_in_container(settings, script_path)
322
346
  # exec
@@ -352,16 +376,14 @@ class Manager
352
376
 
353
377
  def self._run_setup_script(settings, script)
354
378
  if script['type']=='shell'
355
- return _run_setup_script_shell(settings, script)
379
+ return _run_setup_script_shell_from_host(settings, script)
356
380
  end
357
381
 
358
382
  return nil
359
383
  end
360
384
 
361
- def self._run_setup_script_shell(settings, script)
362
- #
385
+ def self._run_setup_script_shell_from_host(settings, script)
363
386
  cmd %Q(cd #{settings.dir_server_root} && #{script['script']} )
364
-
365
387
  end
366
388
 
367
389
 
@@ -1,3 +1,3 @@
1
1
  module DockerBuilder
2
- VERSION = "0.1.33"
2
+ VERSION = "0.1.34"
3
3
  end
data/readme.md CHANGED
@@ -344,6 +344,25 @@ docker exec -ti container_name /bin/bash
344
344
 
345
345
 
346
346
 
347
+
348
+ # Provision
349
+
350
+ ## Run provision after start
351
+
352
+ ### Run provision from host machine
353
+
354
+ Run from outside container
355
+
356
+ ```
357
+ 'provision' => {
358
+ "bootstrap" => [
359
+ {'type' => 'shell', 'run_from'=>'host', 'script'=>'name=myserver ruby myprovision1.rb' }
360
+ ]
361
+ }
362
+
363
+ ```
364
+
365
+
347
366
  ## Development
348
367
 
349
368
  After checking out the repo, run `bin/setup` to install dependencies.
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: docker-builder
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.33
4
+ version: 0.1.34
5
5
  platform: ruby
6
6
  authors:
7
7
  - Max Ivak