docker-builder 0.1.38 → 0.1.41
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 +0 -2
- data/lib/docker_builder/server_settings.rb +7 -2
- 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: bacc61b8a7092799d7984a6d95b5c16f7b15c38a
|
|
4
|
+
data.tar.gz: 7670e656db1f00ae248df9471e631949575efdb7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: bad544f02250651a75102f403e1d5ccf76218c3c14e4eb8c7905f18108153e55cbfb7b3be9c2658c5f51c6ab45b0e617649efc2fe1db14c519a9c916b1c89078
|
|
7
|
+
data.tar.gz: 3ec8237997dd2919b96ecfff2b346e6b21984b4631477e77d771b810e12a6d664f20838c81bc96275839b9ed93a58b17cf6c79f21fb3babacaa9a4442fe361ba
|
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.41.gem
|
|
@@ -14,7 +14,7 @@ class ServerSettings
|
|
|
14
14
|
|
|
15
15
|
|
|
16
16
|
def all_attributes
|
|
17
|
-
res = properties
|
|
17
|
+
res = properties.clone
|
|
18
18
|
|
|
19
19
|
res['base'] = {
|
|
20
20
|
'image_name'=> image_name,
|
|
@@ -157,7 +157,8 @@ class ServerSettings
|
|
|
157
157
|
if v =~ /^\./
|
|
158
158
|
s = v.gsub /^\.\//, ''
|
|
159
159
|
|
|
160
|
-
res = "$PWD/servers/#{self.name}/#{s}"
|
|
160
|
+
#res = "$PWD/servers/#{self.name}/#{s}"
|
|
161
|
+
res = File.expand_path(s, dir_server_root)
|
|
161
162
|
|
|
162
163
|
elsif v =~ /^\/\//
|
|
163
164
|
res = self.properties['common']['dir_data']+(v.gsub /^\/\//, '')
|
|
@@ -188,6 +189,8 @@ class ServerSettings
|
|
|
188
189
|
def docker_volumes
|
|
189
190
|
a = properties['docker']['volumes'] || []
|
|
190
191
|
|
|
192
|
+
#puts "volumes a=#{a}"
|
|
193
|
+
|
|
191
194
|
# fix paths
|
|
192
195
|
res = a.map do |r|
|
|
193
196
|
path_local = volume_path_local(r[0])
|
|
@@ -195,6 +198,8 @@ class ServerSettings
|
|
|
195
198
|
[path_local, r[1]]
|
|
196
199
|
end
|
|
197
200
|
|
|
201
|
+
#puts "volumes: #{res}"
|
|
202
|
+
|
|
198
203
|
res
|
|
199
204
|
end
|
|
200
205
|
|
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.41
|
|
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-24 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|