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

Fixed kamal-proxy remove command

Browse Source
This commit is contained in:
Igor Alexandrov
2024-10-31 10:56:43 +04:00
parent aa2906086a
commit 86657b0172
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/kamal/cli/accessory.rb
View File

@@ -98,8 +98,8 @@ class Kamal::Cli::Accessory < Kamal::Cli::Base
execute *accessory.stop, raise_on_non_zero_exit: false
if accessory.running_proxy?
target = accessory.container_id_for(container_name: accessory.service_name, only_running: true)
execute *accessory.remove(target: target)
target = capture_with_info(*accessory.container_id_for(container_name: accessory.service_name, only_running: true)).strip
execute *accessory.remove if target
end
end
end

8
lib/kamal/commands/accessory.rb
View File

@@ -2,7 +2,7 @@ class Kamal::Commands::Accessory < Kamal::Commands::Base
attr_reader :accessory_config
delegate :service_name, :image, :hosts, :port, :files, :directories, :cmd,
:network_args, :publish_args, :env_args, :volume_args, :label_args, :option_args,
:secrets_io, :secrets_path, :env_directory, :running_proxy?,
:secrets_io, :secrets_path, :env_directory, :proxy, :running_proxy?,
to: :accessory_config
delegate :proxy_container_name, to: :config
@@ -41,11 +41,11 @@ class Kamal::Commands::Accessory < Kamal::Commands::Base
end
def deploy(target:)
proxy_exec :deploy, service_name, *accessory_config.proxy.deploy_command_args(target: target)
proxy_exec :deploy, service_name, *proxy.deploy_command_args(target: target)
end
def remove(target:)
proxy_exec :remove, service_name, *accessory_config.proxy.remove_command_args(target: target)
def remove
proxy_exec :remove, service_name
end