docker-builder 0.1.28 → 0.1.29
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 +18 -1
- data/lib/docker_builder/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 25b87b6681068503f2f6d0d8ec3d6173e0af7381
|
|
4
|
+
data.tar.gz: c18e85a54b8be929901184b925df68a0d9d7fd8a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 63ed4d061457d2d857759c42bce8e9997a0ca0d632232a2681441db91cbbc7465e64a8ee06d322aa47e63442f692e3cd7a8aba71a68536657543e84a406e9b58
|
|
7
|
+
data.tar.gz: 44f5c0cfbb9fbe3871f0160095dc4efb9e82ac3e96ebcbff696f4cca40b261d3849728bd680c79c4f8ced2b6a6df98803463ac0fab227dfa22e4d21499bd1ad7
|
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.29.gem
|
|
@@ -136,7 +136,6 @@ class Manager
|
|
|
136
136
|
def self._run_container(settings)
|
|
137
137
|
puts "run container ..."
|
|
138
138
|
|
|
139
|
-
install_node_script_type = (settings['install']['node']['script_type'] rescue nil)
|
|
140
139
|
bootstrap_type = (settings['install']['bootstrap']['type'] rescue nil)
|
|
141
140
|
|
|
142
141
|
#
|
|
@@ -153,6 +152,8 @@ class Manager
|
|
|
153
152
|
|
|
154
153
|
|
|
155
154
|
# provision after start
|
|
155
|
+
install_node_script_type = (settings['install']['node']['script_type'] rescue nil)
|
|
156
|
+
install_bootstrap_script_type = (settings['install']['bootstrap']['script_type'] rescue nil)
|
|
156
157
|
|
|
157
158
|
if install_node_script_type && install_node_script_type=='chef_recipe'
|
|
158
159
|
# run container and provision with chef
|
|
@@ -177,6 +178,14 @@ class Manager
|
|
|
177
178
|
|
|
178
179
|
end
|
|
179
180
|
|
|
181
|
+
# bootstrap
|
|
182
|
+
if install_bootstrap_script_type && install_bootstrap_script_type=='shell'
|
|
183
|
+
script = settings['install']['bootstrap']['script'] || '/opt/bootstrap/bootstrap.sh'
|
|
184
|
+
|
|
185
|
+
# bootstsrap with shell script
|
|
186
|
+
run_bootsrap_shell_script_in_container(settings, script)
|
|
187
|
+
end
|
|
188
|
+
|
|
180
189
|
|
|
181
190
|
true
|
|
182
191
|
end
|
|
@@ -204,6 +213,14 @@ class Manager
|
|
|
204
213
|
setup_container_after_start(settings)
|
|
205
214
|
end
|
|
206
215
|
|
|
216
|
+
|
|
217
|
+
def self.run_bootsrap_shell_script_in_container(settings, script_path)
|
|
218
|
+
# exec
|
|
219
|
+
cmd %Q(docker exec #{settings.container_name} #{script_path} )
|
|
220
|
+
end
|
|
221
|
+
|
|
222
|
+
|
|
223
|
+
|
|
207
224
|
def self.setup_container_after_start(settings)
|
|
208
225
|
# second network
|
|
209
226
|
network2 = settings['docker']['network_secondary']
|
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.29
|
|
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-02-07 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|