spacebar/kamal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set hosts via config rather than options

Browse Source
This commit is contained in:
Donal McBreen
2024-09-16 11:09:22 +01:00
parent e8ff233e81
commit 7f31510aec
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/kamal/cli/proxy.rb
View File

@@ -60,7 +60,7 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
option :rolling, type: :boolean, default: false, desc: "Reboot proxy on hosts in sequence, rather than in parallel" option :rolling, type: :boolean, default: false, desc: "Reboot proxy on hosts in sequence, rather than in parallel"
option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question" option :confirmed, aliases: "-y", type: :boolean, default: false, desc: "Proceed without confirmation question"
def upgrade def upgrade
invoke_options = { "version" => KAMAL.config.version }.merge(options) invoke_options = { "version" => KAMAL.config.latest_tag }.merge(options)
confirming "This will cause a brief outage on each host. Are you sure?" do confirming "This will cause a brief outage on each host. Are you sure?" do
host_groups = options[:rolling] ? KAMAL.hosts : [ KAMAL.hosts ] host_groups = options[:rolling] ? KAMAL.hosts : [ KAMAL.hosts ]
@@ -77,14 +77,20 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
"Stopping and removing kamal-proxy on #{host}, if running..." "Stopping and removing kamal-proxy on #{host}, if running..."
execute *KAMAL.proxy.stop, raise_on_non_zero_exit: false execute *KAMAL.proxy.stop, raise_on_non_zero_exit: false
execute *KAMAL.proxy.remove_container execute *KAMAL.proxy.remove_container
execute *KAMAL.proxy.remove_image
end end
invoke "kamal:cli:proxy:boot", [], invoke_options.merge("hosts" => host_list) begin
reset_invocation(Kamal::Cli::Proxy) old_hosts, KAMAL.specific_hosts = KAMAL.specific_hosts, hosts
invoke "kamal:cli:app:boot", [], invoke_options.merge("hosts" => host_list, version: KAMAL.config.latest_tag) invoke "kamal:cli:proxy:boot", [], invoke_options
reset_invocation(Kamal::Cli::App) reset_invocation(Kamal::Cli::Proxy)
invoke "kamal:cli:prune:all", [], invoke_options.merge("hosts" => host_list) invoke "kamal:cli:app:boot", [], invoke_options
reset_invocation(Kamal::Cli::Prune) reset_invocation(Kamal::Cli::App)
invoke "kamal:cli:prune:all", [], invoke_options
reset_invocation(Kamal::Cli::Prune)
ensure
KAMAL.specific_hosts = old_hosts
end
run_hook "post-proxy-reboot", hosts: host_list run_hook "post-proxy-reboot", hosts: host_list
end end