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

Extract proxy_default_boot_options

Browse Source
This commit is contained in:
Donal McBreen
2025-04-17 08:26:10 +01:00
parent dd9048e09c
commit 8ceeda6ac9
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,4 @@
class Kamal::Cli::Proxy < Kamal::Cli::Base class Kamal::Cli::Proxy < Kamal::Cli::Base
delegate :older_version?, to: Kamal::Utils
desc "boot", "Boot proxy on servers" desc "boot", "Boot proxy on servers"
def boot def boot
with_lock do with_lock do
@@ -15,7 +13,7 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
version = capture_with_info(*KAMAL.proxy.version).strip.presence version = capture_with_info(*KAMAL.proxy.version).strip.presence
if version && version != "next" && older_version?(version, Kamal::Configuration::PROXY_MINIMUM_VERSION) if version && version != "next" && Kamal::Utils.older_version?(version, Kamal::Configuration::PROXY_MINIMUM_VERSION)
raise "kamal-proxy version #{version} is too old, run `kamal proxy reboot` in order to update to at least #{Kamal::Configuration::PROXY_MINIMUM_VERSION}" raise "kamal-proxy version #{version} is too old, run `kamal proxy reboot` in order to update to at least #{Kamal::Configuration::PROXY_MINIMUM_VERSION}"
end end
execute *KAMAL.proxy.start_or_run execute *KAMAL.proxy.start_or_run
@@ -42,17 +40,17 @@ class Kamal::Cli::Proxy < Kamal::Cli::Base
*options[:docker_options].map { |option| "--#{option}" } *options[:docker_options].map { |option| "--#{option}" }
] ]
default_boot_options = [ image = [
*(KAMAL.config.proxy_publish_args(Kamal::Configuration::PROXY_HTTP_PORT, Kamal::Configuration::PROXY_HTTPS_PORT, nil)), options[:registry].presence,
*(KAMAL.config.proxy_logging_args(Kamal::Configuration::PROXY_LOG_MAX_SIZE)), options[:repository].presence || KAMAL.config.proxy_repository_name,
] KAMAL.config.proxy_image_name
].compact.join("/")
image = [ options[:registry].presence, options[:repository] || KAMAL.config.proxy_repository_name, KAMAL.config.proxy_image_name ].compact.join("/")
image_version = options[:image_version] image_version = options[:image_version]
on(KAMAL.proxy_hosts) do |host| on(KAMAL.proxy_hosts) do |host|
execute(*KAMAL.proxy.ensure_proxy_directory) execute(*KAMAL.proxy.ensure_proxy_directory)
if boot_options != default_boot_options if boot_options != KAMAL.config.proxy_default_boot_options
upload! StringIO.new(boot_options.join(" ")), KAMAL.config.proxy_options_file upload! StringIO.new(boot_options.join(" ")), KAMAL.config.proxy_options_file
else else
execute *KAMAL.proxy.reset_boot_options, raise_on_non_zero_exit: false execute *KAMAL.proxy.reset_boot_options, raise_on_non_zero_exit: false

7
lib/kamal/configuration.rb
View File

@@ -257,6 +257,13 @@ class Kamal::Configuration
argumentize "--log-opt", "max-size=#{max_size}" if max_size.present? argumentize "--log-opt", "max-size=#{max_size}" if max_size.present?
end end
def proxy_default_boot_options
[
*(KAMAL.config.proxy_publish_args(Kamal::Configuration::PROXY_HTTP_PORT, Kamal::Configuration::PROXY_HTTPS_PORT, nil)),
*(KAMAL.config.proxy_logging_args(Kamal::Configuration::PROXY_LOG_MAX_SIZE))
]
end
def proxy_options_default def proxy_options_default
[ *proxy_publish_args(PROXY_HTTP_PORT, PROXY_HTTPS_PORT), *proxy_logging_args(PROXY_LOG_MAX_SIZE) ] [ *proxy_publish_args(PROXY_HTTP_PORT, PROXY_HTTPS_PORT), *proxy_logging_args(PROXY_LOG_MAX_SIZE) ]
end end