docker-builder 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 047aad08d949104ac5a24e2718596a8d2310eeb8
-  data.tar.gz: 5b47426f4cf4922acc0caa9cea7f6050f1e8ae63
+  metadata.gz: 75d96d38619580c04a14f9882ac3ee0293f00b85
+  data.tar.gz: 91260ad7501c8af414ce899b6335bf723f9d83ea
 SHA512:
-  metadata.gz: 1388c814c45f75131dd709eb1854c3b5b2516e532875dd270428e6f95cec2a3658de290e79d474e50794e4986a1e2f918a98694ad118458145e5e02433255f7b
-  data.tar.gz: 7104db5ba5249fc31c415787c11a92d2fd9c6b6d4b1cd418999c40b7de85e3fdc297b7852c34d3641964927236856827abff0e4e688708137ea3d658bd66c809
+  metadata.gz: c4fd0710fc71c5628b25179860a822e500d559daa82efceda1e171d662fdd5dddf1bff8f035ae15e07617455b944a499e980eb59992dc58689b79b0a184f2a27
+  data.tar.gz: 8663e64e2737860cac04dff03d6bf1ab44787e32c7e9c00451e4d6bd4b794468fc6d8ff74291729158933d454222a072a5a56ede09348bc995bc08d724577844

data/lib/docker_builder/manager_swarm.rb

@@ -5,7 +5,7 @@ module DockerBuilder
       puts "destroying service #{server_name}..."
 
       #
-      cmd %Q(docker service rm #{settings.container_name} )
+      cmd %Q(docker service rm #{settings.service_name} )
 
       #
       return true
@@ -35,7 +35,7 @@ module DockerBuilder
       run_opts << docker_opts['swarm_options']
 
       cmd %Q(docker service create \
---name #{settings.container_name} \
+--name #{settings.service_name} \
 #{run_opts.join(' ')} \
 #{settings.image_name} #{settings['docker']['command']}
 )

data/lib/docker_builder/server_settings.rb

@@ -57,6 +57,18 @@ class ServerSettings
     attributes['common']['prefix']
   end
 
+  def container_prefix
+    "#{attributes['common']['prefix']}#{attributes['common']['container_prefix']}"
+  end
+
+  def image_prefix
+    "#{attributes['common']['prefix']}#{attributes['common']['image_prefix']}"
+  end
+
+  def service_prefix
+    "#{attributes['common']['prefix']}#{attributes['common']['service_prefix']}"
+  end
+
 
   ###
 
@@ -76,10 +88,10 @@ class ServerSettings
 
     #
     if attributes['build']['image_name']
-      return "#{attributes['common']['image_prefix']}#{attributes['build']['image_name']}"
+      s = "#{attributes['build']['image_name']}"
     end
 
-    "#{attributes['common']['image_prefix']}#{s}"
+    "#{image_prefix}#{s}"
   end
 
   def need_build?
@@ -94,11 +106,11 @@ class ServerSettings
     name ||= attributes['name']
     s = name
 
-    "#{attributes['common']['prefix']}#{s}"
+    "#{container_prefix}#{s}"
   end
 
   def chef_node_name
-    "#{attributes['common']['prefix']}#{name}"
+    "#{prefix}#{name}"
   end
 
   def volume_path_local(v)
@@ -188,7 +200,7 @@ class ServerSettings
 
     # fix
     res = a.map do |r|
-      ["#{attributes['common']['prefix']}#{r[0]}", r[1]]
+      ["#{container_prefix}#{r[0]}", r[1]]
     end
 
     res

data/lib/docker_builder/version.rb

@@ -1,3 +1,3 @@
 module DockerBuilder
-  VERSION = "0.1.21"
+  VERSION = "0.1.22"
 end

data/readme.md

@@ -507,3 +507,31 @@ docker: {
 * swarm_network - network name
 * swarm_options - options to pass to docker service create command
 
+
+
+# Options
+
+## prefix
+
+prefix for image names, container names, and service names (for swarm mode)
+
+* prefix - common prefix. Added to all names
+* container_prefix - prefix for containers
+* image_prefix - prefix for images
+* service_prefix  - prefix for services
+    
+    
+Example:
+* container name = $prefix$container_prefix$name
+
+```
+prefix='my-'
+container_prefix='test-'
+
+container name will be like 
+my-test-redis
+
+```
+
+    
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-builder
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Max Ivak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler