docker-builder 0.1.38 → 0.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63eb356b5708d5b8e8ced37c1e15e4d7d14f398b
-  data.tar.gz: 5b57b4dae9c1d1b5f89632766d9231190dfcb97e
+  metadata.gz: bacc61b8a7092799d7984a6d95b5c16f7b15c38a
+  data.tar.gz: 7670e656db1f00ae248df9471e631949575efdb7
 SHA512:
-  metadata.gz: f3788f2a6a2fd7b557c659c377f18c0395a3a463348f19cd93930fafa330537327178b97a9027ddd6ddea462dba1db46903688aa836ac21b23c9e0b6b2a74ee9
-  data.tar.gz: ac143ecd8d1c3d712660f46ed49539e4c17f749d04effe5961429de8e29ef6e6e847e65a9baa84a50d6315d934835c6d7f78f3ac84444bb12a1d939896c3e1e3
+  metadata.gz: bad544f02250651a75102f403e1d5ccf76218c3c14e4eb8c7905f18108153e55cbfb7b3be9c2658c5f51c6ab45b0e617649efc2fe1db14c519a9c916b1c89078
+  data.tar.gz: 3ec8237997dd2919b96ecfff2b346e6b21984b4631477e77d771b810e12a6d664f20838c81bc96275839b9ed93a58b17cf6c79f21fb3babacaa9a4442fe361ba

data/install_local.sh

@@ -1,2 +1,2 @@
 gem build docker-builder.gemspec
-gem install ./docker-builder-0.1.38.gem
+gem install ./docker-builder-0.1.41.gem

data/lib/docker_builder/manager.rb

@@ -21,8 +21,6 @@ class Manager
       f.write(settings.all_attributes.to_json)
     end
 
-    #puts "f==#{filename}"
-
     true
   end
 

data/lib/docker_builder/server_settings.rb

@@ -14,7 +14,7 @@ class ServerSettings
 
 
   def all_attributes
-    res = properties
+    res = properties.clone
 
     res['base'] = {
         'image_name'=> image_name,
@@ -157,7 +157,8 @@ class ServerSettings
     if v =~ /^\./
       s = v.gsub /^\.\//, ''
 
-      res = "$PWD/servers/#{self.name}/#{s}"
+      #res = "$PWD/servers/#{self.name}/#{s}"
+      res = File.expand_path(s, dir_server_root)
 
     elsif v =~ /^\/\//
       res = self.properties['common']['dir_data']+(v.gsub /^\/\//, '')
@@ -188,6 +189,8 @@ class ServerSettings
   def docker_volumes
     a = properties['docker']['volumes'] || []
 
+    #puts "volumes a=#{a}"
+
     # fix paths
     res = a.map do |r|
       path_local = volume_path_local(r[0])
@@ -195,6 +198,8 @@ class ServerSettings
       [path_local, r[1]]
     end
 
+    #puts "volumes: #{res}"
+
     res
   end
 

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.38"
+  VERSION = "0.1.41"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.1.41
 platform: ruby
 authors:
 - Max Ivak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler