From 89db5025a0e2bc3eb10e8bdfc7b2100e19728b2a Mon Sep 17 00:00:00 2001 From: Mike Moore Date: Thu, 19 Dec 2024 09:28:37 -0700 Subject: [PATCH 1/4] Configure Thor to "exit on failure". --- lib/kamal/cli/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/kamal/cli/base.rb b/lib/kamal/cli/base.rb index 4aebfd902..2d8760024 100644 --- a/lib/kamal/cli/base.rb +++ b/lib/kamal/cli/base.rb @@ -5,7 +5,7 @@ module Kamal::Cli class Base < Thor include SSHKit::DSL - def self.exit_on_failure?() false end + def self.exit_on_failure?() true end def self.dynamic_command_class() Kamal::Cli::Alias::Command end class_option :verbose, type: :boolean, aliases: "-v", desc: "Detailed logging" From 39e2c4f848b4a32248f894a8832613e4e0e28e32 Mon Sep 17 00:00:00 2001 From: Mike Moore Date: Thu, 19 Dec 2024 12:14:00 -0700 Subject: [PATCH 2/4] Trying the new method for setting proxy boot config. --- test/integration/main_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/main_test.rb b/test/integration/main_test.rb index ce32e6404..c72c14dc8 100644 --- a/test/integration/main_test.rb +++ b/test/integration/main_test.rb @@ -90,7 +90,7 @@ class MainTest < IntegrationTest test "setup and remove" do @app = "app_with_roles" - kamal :proxy, :set_config, + kamal :proxy, :boot_config, "set", "--publish=false", "--options=label=traefik.http.services.kamal_proxy.loadbalancer.server.scheme=http", "label=traefik.http.routers.kamal_proxy.rule=PathPrefix\\\(\\\`/\\\`\\\)", From 32e1b6504dc82de181b8013e89234b0efdbf4dca Mon Sep 17 00:00:00 2001 From: Mike Moore Date: Fri, 20 Dec 2024 08:26:14 -0700 Subject: [PATCH 3/4] Re-trigger GitHub actions. From 2943c4a3010364dd1987e78a594664f5727d404c Mon Sep 17 00:00:00 2001 From: Mike Moore Date: Fri, 20 Dec 2024 08:45:47 -0700 Subject: [PATCH 4/4] Use the newer option name. --- test/integration/main_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/main_test.rb b/test/integration/main_test.rb index c72c14dc8..a48051fe0 100644 --- a/test/integration/main_test.rb +++ b/test/integration/main_test.rb @@ -92,7 +92,7 @@ class MainTest < IntegrationTest kamal :proxy, :boot_config, "set", "--publish=false", - "--options=label=traefik.http.services.kamal_proxy.loadbalancer.server.scheme=http", + "--docker-options=label=traefik.http.services.kamal_proxy.loadbalancer.server.scheme=http", "label=traefik.http.routers.kamal_proxy.rule=PathPrefix\\\(\\\`/\\\`\\\)", "label=traefik.http.routers.kamal_proxy.priority=2"