dry-stack 0.1.26 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f4c014e08d5156845c9dc3c0884ab04fe72f0f75eaffe03415a0d24be6e4b2a
-  data.tar.gz: c2faae7a7822c71d4e97590b0c7eec7abec5e5f32fb3cbd3baaa31534a302e96
+  metadata.gz: 3d0987eabb73bc09cec5a5199ea82cf507a1b6209b871ba3f9e8b8b4bf8f8e54
+  data.tar.gz: '0219fffa6fb22d82bb0a11f06ea9f30e3e0484705a783746325edbd0badbf03f'
 SHA512:
-  metadata.gz: 48df74bbb2801e09b50a40d5f9a771f0da561b1e617d3ac30709ad5de97ce2b59a31b6f49d6991cc0502df3ee3e70f858a85e1d7bf577083fa0c2233c143b9bc
-  data.tar.gz: ceed8407e46f9142d772873813cbeee78869f0f2bf305815e319a03ebabd2e10b6b26d1821e8f129c8043dbb1f674ef6f26e636e6bf1b9d9c2af0bbd1f78172f
+  metadata.gz: c819b5ab4611cb68d98787e8f44c359e33a2bed99498c6e23b75d817f21743840a9e0167dac169f712a8a7c834ebd39dcca0a2312476a0a036d52326161b3e8c
+  data.tar.gz: eb4baeb1c7abe692ea1adc5130ddb7a6cd21801098c1b199cb112abd7de4300cf4644e7a6a06e48ff45bd13a2a06fc55cdd97b189c67fe530548915eff191be1

data/lib/dry-stack/command_swarm_deploy.rb

@@ -35,14 +35,14 @@ Dry::CommandLine::COMMANDS[:swarm_deploy] = Class.new do
     # system " echo \"#{yaml.gsub("`", '\\\`')}\" | docker stack deploy -c - #{stack.name} --prune --resolve-image changed"
 
     #  --prune  --resolve-image changed
-    exec_i "docker stack deploy -c - --with-registry-auth #{extra} #{stack.name}", yaml
+    exec_i "docker --context #{name} stack deploy -c - --with-registry-auth #{extra} #{stack.name}", yaml
     # Hide messages like:
     # Error response from daemon: rpc error: code = InvalidArgument desc = config 'grafana_dashboards_yaml-206a34dc77dc394d78a207c7abde327d' is in use by the following service: grafana_grafana
-    system "docker config rm $(docker config ls --filter label=com.docker.stack.namespace=#{stack.name} --format \"{{.ID}}\") 2>&1 | grep -v \"is in use\""
+    system "docker --context #{name} config rm $(docker config ls --filter label=com.docker.stack.namespace=#{stack.name} --format \"{{.ID}}\") 2>&1 | grep -v \"is in use\""
 
-    exec_i "docker config rm #{stack.name}_readme || echo 'failed to remove config #{stack.name}_readme'"
+    exec_i "docker --context #{name} config rm #{stack.name}_readme || echo 'failed to remove config #{stack.name}_readme'"
     puts "stack description: #{stack.description}"
-    exec_i "docker config create #{stack.name}_readme -", stack.description
+    exec_i "docker --context #{name} config create #{stack.name}_readme -", stack.description
   end
 
   def help = ['Call docker stack deploy & add config readme w/ description',

data/lib/dry-stack/stack.rb

@@ -270,11 +270,23 @@ module Dry
         service[:deploy][:labels] = service[:deploy][:labels].map{ env_sub[_1] }
         service[:environment].transform_values!{ _1.is_a?(String) ? (env_sub[_1]) : _1 }
 
-        pp_i = @publish_ports[name]&.reject { _1.class == String }
+        pp_h = @publish_ports[name]&.select { _1.class == Hash }
+        pp_i = @publish_ports[name]&.select { _1.class == Integer }
         pp_s = @publish_ports[name]&.select { _1.class == String }
         service[:ports] = pp_i&.zip(service[:ports] || pp_i)&.map { _1.join ':' }
         service[:ports] = (service[:ports] || []) + pp_s unless pp_s.nil?
 
+        if pp_h&.any?
+          service[:ports] = service[:ports].map { |s|
+            if s.class == String
+              published, target = s.split(':').map(&:to_i)
+              { published:, target:, protocol: 'tcp', mode: 'ingress'}
+            else
+              s
+            end
+          } + pp_h
+        end
+
         service[:logging] ||= @logging[name.to_sym]
 
         service[:volumes]&.map!&.with_index do |volume, index|
@@ -391,7 +403,7 @@ module Dry
     end
 
     def PublishPorts(ports)
-      @publish_ports.merge! ports.to_h { |k, v| [k,[v].flatten] }
+      @publish_ports.merge! ports.to_h { |k, v| [k,@publish_ports[k].to_a + [v].flatten] }
     end
 
     def Service(name, opts = {}, &block)

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Stack
-    VERSION = '0.1.26'
+    VERSION = '0.1.28'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-stack
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.28
 platform: ruby
 authors:
 - Artyom B
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-29 00:00:00.000000000 Z
+date: 2025-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake