Merge pull request #368 from tsvallender/main

basecamp · Aug 24, 2023 · eb3cb81 · eb3cb81
2 parents 519659b + c2ec04f
commit eb3cb81
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/kamal/commands/traefik.rb b/lib/kamal/commands/traefik.rb
@@ -11,7 +11,7 @@ def run
     docker :run, "--name traefik",
       "--detach",
       "--restart", "unless-stopped",
-      "--publish", port,
+      *publish_args,
       "--volume", "/var/run/docker.sock:/var/run/docker.sock",
       *env_args,
       *config.logging_args,
@@ -64,6 +64,10 @@ def port
   end
 
   private
+    def publish_args
+      argumentize "--publish", port unless config.traefik["publish"] == false
+    end
+
     def label_args
       argumentize "--label", labels
     end

diff --git a/test/commands/traefik_test.rb b/test/commands/traefik_test.rb
@@ -25,6 +25,11 @@ class CommandsTraefikTest < ActiveSupport::TestCase
     assert_equal \
       "docker run --name traefik --detach --restart unless-stopped --publish 8080:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=\"DEBUG\" --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
       new_command.run.join(" ")
+
+    @config[:traefik]["publish"] = false
+    assert_equal \
+      "docker run --name traefik --detach --restart unless-stopped --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{@image} --providers.docker --log.level=\"DEBUG\" --accesslog.format=\"json\" --api.insecure --metrics.prometheus.buckets=\"0.1,0.3,1.2,5.0\"",
+      new_command.run.join(" ")
   end
 
   test "run with ports configured" do