Use Volume for kamal proxy config volume

This commit is contained in:
Donal McBreen
2024-09-12 15:48:10 +01:00
parent c21757f747
commit d7d6fa34b0
4 changed files with 5 additions and 12 deletions

View File

@@ -17,7 +17,7 @@ class Kamal::Commands::Proxy < Kamal::Commands::Base
"--restart", "unless-stopped", "--restart", "unless-stopped",
*proxy_config.publish_args, *proxy_config.publish_args,
"--volume", "/var/run/docker.sock:/var/run/docker.sock", "--volume", "/var/run/docker.sock:/var/run/docker.sock",
"--volume", "#{proxy_config.config_directory_as_docker_volume}:/root/.config/kamal-proxy", *proxy_config.config_volume.docker_args,
*config.logging_args, *config.logging_args,
proxy_config.image proxy_config.image
end end

View File

@@ -207,10 +207,6 @@ class Kamal::Configuration
end end
def run_directory_as_docker_volume
File.join "$(pwd)", run_directory
end
def hooks_path def hooks_path
raw_config.hooks_path || ".kamal/hooks" raw_config.hooks_path || ".kamal/hooks"
end end

View File

@@ -59,8 +59,10 @@ class Kamal::Configuration::Proxy
optionize deploy_options optionize deploy_options
end end
def config_directory_as_docker_volume def config_volume
File.join config.run_directory_as_docker_volume, "proxy", "config" Kamal::Configuration::Volume.new \
host_path: File.join(config.run_directory, "proxy", "config"),
container_path: "/root/.config/kamal-proxy"
end end
private private

View File

@@ -291,11 +291,6 @@ class ConfigurationTest < ActiveSupport::TestCase
assert_equal ".kamal", config.run_directory assert_equal ".kamal", config.run_directory
end end
test "run directory as docker volume" do
config = Kamal::Configuration.new(@deploy)
assert_equal "$(pwd)/.kamal", config.run_directory_as_docker_volume
end
test "asset path" do test "asset path" do
assert_nil @config.asset_path assert_nil @config.asset_path
assert_equal "foo", Kamal::Configuration.new(@deploy.merge!(asset_path: "foo")).asset_path assert_equal "foo", Kamal::Configuration.new(@deploy.merge!(asset_path: "foo")).asset_path