app-rb 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e711d636dadff50ef85e9a5d2d064966b3effc49
-  data.tar.gz: b73199db204a95a85669ed40c690449f152923c2
+  metadata.gz: 456163eecd579201380e681ffa1dc1889ae2d275
+  data.tar.gz: d05dbe3485b7efe9aead02c8e43d3c7e6788b40a
 SHA512:
-  metadata.gz: 691263ddcd9e2bebdb6076bc2dfda71a7aab9cd9dbf978da5cb5b16808fa345b6b08ef5d99573ea4503c90f55388283c4c1997cfe6d7dda36edf7d13e6cc48ac
-  data.tar.gz: 4c0b4ca076d63fca41eec03907b13f26a1ad0475ffbe62a69ea153c8cd37a56e4cf3ec37b983e2e8a9ba44c37d994a2b8d13aa06ef767fffeba5e6bfd6708bde
+  metadata.gz: fbe5715a5d6bf88647269887bc7e1f61093394a0006728b203127dbb31d3ac76331b80c9f245d9fbf842b3d82dc20a308d0188015ee9603acf39ac1ff11ee8dc
+  data.tar.gz: ec7084d6d0f13c7499ae97ebf32236928fc58bbbf9890694694732295dca84ed2a2d70e1cdf1794762983c5f0d140a073e4a8eff647a5a9acfa25da54ef1a63d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## App-rb 0.8.0 (April 13, 2017) ##
+
+* Cosmetic fix in docker labels
+
 ## App-rb 0.7.0 (April 13, 2017) ##
 
 * Support crypting of sensitive information using vault file as key.

data/lib/app-rb/command.rb

@@ -204,7 +204,8 @@ module AppRb
           {
             app: @config.app,
             build: @base,
-            kind: "batch"
+            kind: "batch",
+            key: "pre-#{index}",
           },
           @config.env,
           payload["opts"]
@@ -227,12 +228,12 @@ module AppRb
         plan = payload["nodes"].map{ |n| [n.ip, []] }.to_h
         payload["amount"].times do |index|
           ip = payload["nodes"][index % payload["nodes"].length].ip
-          plan[ip].push("#{payload["key"]}-#{index}")
+          plan[ip].push({name: "#{payload["key"]}-#{index}", key: payload["key"]})
         end
 
         payload["nodes"].map { |node|
           Thread.new do
-            (plan[node.ip] || []).each do |name|
+            (plan[node.ip] || []).each do |desc|
               if payload["port"]
                 port = AppRb::Util.get_free_port(@config.user, node.ip)
                 puts "[#{node.name}] port=#{port}"
@@ -240,13 +241,13 @@ module AppRb
 
               AppRb::Util::Docker.run_daemon(
                 @config.user, node.ip,
-                "#{@base}-#{name}", full_image_name(hash), payload["cmd"],
+                "#{@base}-#{desc[:name]}", full_image_name(hash), payload["cmd"],
                 {
                   app: @config.app,
                   build: @base,
                   kind: "daemon",
-                  name: name,
-                  has_port: (payload["port"] ? "yes" : "no")
+                  key: desc[:key],
+                  has_port: (payload["port"] ? "yes" : "no"),
                 },
                 @config.env,
                 payload["opts"],
@@ -256,7 +257,7 @@ module AppRb
               if payload["port"]
                 AppRb::Util::Consul.register_service(
                   node.ip,
-                  "#{@base}-#{name}", "#{@base}-#{payload["key"]}", port, payload["check_url"] || "/",
+                  "#{@base}-#{desc[:name]}", "#{@base}-#{payload["key"]}", port, payload["check_url"] || "/",
                   [@config.app, @base]
                 )
               end

data/lib/app-rb/version.rb

@@ -1,3 +1,3 @@
 module AppRb
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app-rb
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Alexey Vakhov