Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reuse CONTAINER_NAME constant #976

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Reuse CONTAINER_NAME constant #976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d08d00
Reuse CONTAINER_NAME constant
igor-alexandrov Sep 26, 2024
e23103a
Delegate instead of define new method
igor-alexandrov Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions lib/kamal/configuration.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ class Kamal::Configuration
attr_reader :destination, :raw_config, :secrets
attr_reader :accessories, :aliases, :boot, :builder, :env, :logging, :proxy, :servers, :ssh, :sshkit, :registry

delegate :container_name, to: :proxy, prefix: true

include Validation

PROXY_MINIMUM_VERSION = "v0.8.0"
Expand Down Expand Up @@ -265,10 +267,6 @@ def proxy_image
"basecamp/kamal-proxy:#{PROXY_MINIMUM_VERSION}"
end

def proxy_container_name
"kamal-proxy"
end

def proxy_directory
File.join run_directory, "proxy"
end
Expand Down
4 changes: 4 additions & 0 deletions lib/kamal/configuration/proxy.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ def merge(other)
self.class.new config: config, proxy_config: proxy_config.deep_merge(other.proxy_config)
end

def container_name
CONTAINER_NAME
end

private
def seconds_duration(value)
value ? "#{value}s" : nil
Expand Down