docker-builder 0.1.34 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14f1c7d7ca377f0eb931226a79fb56e29c3ca6ef
-  data.tar.gz: 26794a1d0cef7af4b351be358e78e77d4ad2800c
+  metadata.gz: 2255579f59a5cfe1a5e1d927c00aee8b7f1202b9
+  data.tar.gz: 0dfee3c6a95987db55800c0228d71febf642afda
 SHA512:
-  metadata.gz: f8638d3631950819b5b27a9c7f6aa186e1d59bac1a7b63b5b85653f35df41afa5ba782f1ee83a560f0479e931be519ded6860bf752ce6e28c1864d5b5505d3dc
-  data.tar.gz: 035d9f135523e511775449d90e6b080727222b7eef2c5efd18fa971c2c1f746eedbdde50ee2d32e4e32d3cf451a320f628c31eb3464cc45d6e5b6549f1957a18
+  metadata.gz: fe2cbc5967ce7caf926dcf6cad392046152951cf5f5d04592c5def566c4f3bd3a96e557ba96cabdd70e2f209bd02e9f20ba5bfa30e729987cfb820f00c96c9b7
+  data.tar.gz: 4e68e3eba7c39406cadfc2df886507c826dd603335940a4778267934dfc1ad8cf58207e9f7a923dfdbda465ff11f5b1c1568d0574730470c6a8252b9d6e32500

data/install_local.sh

@@ -1,2 +1,2 @@
 gem build docker-builder.gemspec
-gem install ./docker-builder-0.1.34.gem
+gem install ./docker-builder-0.1.37.gem

data/lib/docker_builder/manager.rb

@@ -232,10 +232,10 @@ class Manager
 
 
   def self.wait_until_running(container_name)
-    retries = 20
+    retries = 10
     until system("docker exec #{container_name} true") || retries < 0
-      sleep 0.5
-      retries == retries - 1
+      sleep 1
+      retries = retries - 1
     end
 
     assert_container_running(container_name)

data/lib/docker_builder/server_settings.rb

@@ -1,20 +1,20 @@
 module DockerBuilder
 
 class ServerSettings
-  attr_accessor :attributes
+  attr_accessor :properties
 
   def get_binding
     return binding()
   end
 
-  def attributes
-    @attributes ||= {}
-    @attributes
+  def properties
+    @properties ||= {}
+    @properties
   end
 
 
   def all_attributes
-    res = attributes
+    res = properties
 
     res['base'] = {
         'image_name'=> image_name,
@@ -33,7 +33,7 @@ class ServerSettings
 
   #
   def node
-    res = attributes['attributes'] || {}
+    res = properties['attributes'] || {}
 
     res['name'] = name
     res['container_name'] = container_name
@@ -41,61 +41,99 @@ class ServerSettings
     res
   end
 
-  #
+  ### DSL
   def set(name, v)
-    attributes[name] = v
+    properties[name] = v
   end
 
   def add(name, v)
-    attributes[name] = {} if attributes[name].nil?
+    properties[name] = {} if properties[name].nil?
+
+    properties[name].merge!(v)
+  end
+
+
+  def add_config(a)
+    # merge
+    build(a['build']) if a['build']
+    provision(a['provision']) if a['provision']
+    docker(a['docker']) if a['docker']
+    attributes(a['attributes']) if a['attributes']
+
+
+  end
+
+  def build(v)
+    properties['build'] = v
+  end
 
-    attributes[name].merge!(v)
+  def provision(v)
+    properties['provision'] = v
   end
 
+  def docker(a)
+    # merge
+    properties['docker'] ||= {}
+
+    a.each do |k,v|
+      properties['docker'][k] = v
+    end
+  end
+
+  def attributes(a)
+    # merge
+    properties['attributes'] ||= {}
+
+    a.each do |k,v|
+      properties['attributes'][k] = v
+    end
+  end
+
+
   ###
   def prefix
-    attributes['common']['prefix']
+    properties['common']['prefix']
   end
 
   def container_prefix
-    "#{attributes['common']['prefix']}#{attributes['common']['container_prefix']}"
+    "#{properties['common']['prefix']}#{properties['common']['container_prefix']}"
   end
 
   def image_prefix
-    "#{attributes['common']['prefix']}#{attributes['common']['image_prefix']}"
+    "#{properties['common']['prefix']}#{properties['common']['image_prefix']}"
   end
 
   def service_prefix
-    "#{attributes['common']['prefix']}#{attributes['common']['service_prefix']}"
+    "#{properties['common']['prefix']}#{properties['common']['service_prefix']}"
   end
 
 
   ###
 
   def name
-    attributes['name']
+    properties['name']
   end
 
 
 
   def image_name
     if !need_build?
-      bi = attributes['build']['base_image']
+      bi = properties['build']['base_image']
       return "#{bi['name']}:#{bi['tag']}"
     end
 
     #
-    s = attributes['name']
+    s = properties['name']
 
-    if attributes['build']['image_name']
-      s = "#{attributes['build']['image_name']}"
+    if properties['build']['image_name']
+      s = "#{properties['build']['image_name']}"
     end
 
     "#{image_prefix}#{s}"
   end
 
   def need_build?
-    build_type = attributes['build']['build_type']
+    build_type = properties['build']['build_type']
     return false if build_type=='' || build_type=='none'
 
 
@@ -103,7 +141,7 @@ class ServerSettings
   end
 
   def container_name(name=nil)
-    name ||= attributes['name']
+    name ||= properties['name']
     s = name
 
     "#{container_prefix}#{s}"
@@ -122,7 +160,7 @@ class ServerSettings
       res = "$PWD/servers/#{self.name}/#{s}"
 
     elsif v =~ /^\/\//
-      res = self.attributes['common']['dir_data']+(v.gsub /^\/\//, '')
+      res = self.properties['common']['dir_data']+(v.gsub /^\/\//, '')
     elsif v =~ /^\//
       res = v
     else
@@ -133,14 +171,14 @@ class ServerSettings
   end
 
   def dir_data
-    "#{attributes['common']['dir_data']}#{self.name}/"
+    "#{properties['common']['dir_data']}#{self.name}/"
   end
 
 
   ### docker swarm services
 
   def service_name(name=nil)
-    name ||= attributes['name']
+    name ||= properties['name']
     s = name
 
     "#{service_prefix}#{s}"
@@ -148,7 +186,7 @@ class ServerSettings
 
   ###
   def docker_volumes
-    a = attributes['docker']['volumes'] || []
+    a = properties['docker']['volumes'] || []
 
     # fix paths
     res = a.map do |r|
@@ -171,7 +209,7 @@ class ServerSettings
   ###
 
   def docker_volumes_from
-    a = attributes['docker']['volumes_from'] || []
+    a = properties['docker']['volumes_from'] || []
 
     # fix paths
     res = a.map do |r|
@@ -191,7 +229,7 @@ class ServerSettings
 
   ###
   def docker_ports
-    a = attributes['docker']['ports'] || []
+    a = properties['docker']['ports'] || []
     a
   end
 
@@ -205,7 +243,7 @@ class ServerSettings
 
   ###
   def docker_links
-    a = attributes['docker']['links'] || []
+    a = properties['docker']['links'] || []
 
     # fix
     res = a.map do |r|
@@ -226,7 +264,7 @@ class ServerSettings
   ###
 
   def run_env_variables
-    a = attributes['docker']['run_env'] || []
+    a = properties['docker']['run_env'] || []
 
     a
   end
@@ -239,21 +277,21 @@ class ServerSettings
   ###
 
   def run_extra_options_string
-    s = attributes['docker']['run_extra_options'] || ''
+    s = properties['docker']['run_extra_options'] || ''
     s
   end
 
 
   ###
   def is_swarm_mode?
-    v = attributes["docker"]["swarm_mode"]
+    v = properties["docker"]["swarm_mode"]
     return false if v.nil?
     return v
   end
 
   ###
   def [](key)
-    attributes[key]
+    properties[key]
   end
 
 
@@ -302,7 +340,7 @@ class Settings
 
     # set from main Config
     Config.servers[name].each do |k,v|
-      settings.attributes[k]=v
+      settings.properties[k]=v
     end
 
 
@@ -321,10 +359,10 @@ class Settings
     eval(t, settings.get_binding)
 
     #
-    settings.attributes['name'] ||= name
+    settings.properties['name'] ||= name
 
     # from common config
-    settings.attributes['common'] = Config.options[:common]
+    settings.properties['common'] = Config.options[:common]
 
     settings
   end

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.34"
+  VERSION = "0.1.37"
 end

data/readme.md

@@ -362,6 +362,8 @@ Run from outside container
     
 ```
 
+it will run script `name=myserver ruby myprovision1.rb` from the host machine.
+
 
 ## Development
 

metadata

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