docker-builder 0.1.48 → 0.1.49
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 +4 -4
- data/install_local.sh +1 -1
- data/lib/docker_builder/manager.rb +8 -7
- data/lib/docker_builder/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0bec6fbf29026bca6f660a567d9d92917bc65186
|
4
|
+
data.tar.gz: 8cebb77981e72d3a567ccad40c2fa98c47c29226
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0838318189427168c736b4d5627b656874b4d713560b3fe211bd8c0415dab46918bf59ca946c94958dd12d66c2eb0bbd8c90b984dd6f6d85ce576857d014fe2d
|
7
|
+
data.tar.gz: 8e87ffd184c80d3109a60ef5adf45b643dc9a673daabf9dce46fc883f6ee1846a739592dd25c17eb1c899b514cebb9d4a85bac5c94ab4f713ba68a2dc3338c1e
|
data/install_local.sh
CHANGED
@@ -1,2 +1,2 @@
|
|
1
1
|
gem build docker-builder.gemspec
|
2
|
-
gem install ./docker-builder-0.1.
|
2
|
+
gem install ./docker-builder-0.1.49.gem
|
@@ -292,8 +292,6 @@ class Manager
|
|
292
292
|
def self.setup_container_after_start(settings)
|
293
293
|
|
294
294
|
# default gateway
|
295
|
-
puts "fix gateway"
|
296
|
-
|
297
295
|
network = settings['docker']['network']
|
298
296
|
if network
|
299
297
|
gateway = network['default_gateway']
|
@@ -308,11 +306,7 @@ class Manager
|
|
308
306
|
|
309
307
|
|
310
308
|
# fix hosts
|
311
|
-
puts "fix hosts"
|
312
|
-
|
313
309
|
container_hosts = settings['docker']['hosts'] || []
|
314
|
-
puts "hosts: #{container_hosts}"
|
315
|
-
puts "docker settings : #{settings['docker']}"
|
316
310
|
container_hosts.each do |r|
|
317
311
|
#cmd %Q(docker exec #{settings.container_name} bash -c 'echo "#{r[0]} #{r[1]}" >> /etc/hosts')
|
318
312
|
cmd %Q(docker exec #{settings.container_name} sh -c 'echo "#{r[0]} #{r[1]}" >> /etc/hosts')
|
@@ -322,6 +316,8 @@ class Manager
|
|
322
316
|
|
323
317
|
|
324
318
|
def self.run_provision_after_start(settings)
|
319
|
+
puts "run_provision_after_start"
|
320
|
+
|
325
321
|
# run bootstrap provision scripts
|
326
322
|
bootstrap_scripts = (settings['provision']['bootstrap'] rescue [])
|
327
323
|
if bootstrap_scripts
|
@@ -376,8 +372,12 @@ class Manager
|
|
376
372
|
end
|
377
373
|
|
378
374
|
def self._run_bootstrap_script(settings, script)
|
375
|
+
puts "run BS script #{script}"
|
376
|
+
|
379
377
|
if script['type']=='shell' && script['run_from']=='host'
|
380
378
|
return _run_bootstrap_script_shell_from_host(settings, script)
|
379
|
+
elsif script['type']=='shell' && (script['run_from'].nil? || script['run_from']=='')
|
380
|
+
_run_bootstrap_script_shell_in_container(settings, script)
|
381
381
|
end
|
382
382
|
|
383
383
|
return nil
|
@@ -390,7 +390,8 @@ class Manager
|
|
390
390
|
end
|
391
391
|
|
392
392
|
|
393
|
-
def self.
|
393
|
+
def self._run_bootstrap_script_shell_in_container(settings, script)
|
394
|
+
script_path = script['script']
|
394
395
|
# exec
|
395
396
|
cmd %Q(docker exec #{settings.container_name} #{script_path} )
|
396
397
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: docker-builder
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.49
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Max Ivak
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-02
|
11
|
+
date: 2017-03-02 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
198
198
|
version: '0'
|
199
199
|
requirements: []
|
200
200
|
rubyforge_project:
|
201
|
-
rubygems_version: 2.
|
201
|
+
rubygems_version: 2.4.8
|
202
202
|
signing_key:
|
203
203
|
specification_version: 4
|
204
204
|
summary: Docker builder
|