From da2a543cbcfa995265cb5583ee9e5802a58c5109 Mon Sep 17 00:00:00 2001 From: Igor Alexandrov Date: Wed, 9 Oct 2024 10:00:49 +0400 Subject: [PATCH] Reverted network arguments everywhere except to accessory config --- lib/kamal/commands/app.rb | 2 +- lib/kamal/commands/app/execution.rb | 2 +- lib/kamal/commands/proxy.rb | 2 +- lib/kamal/configuration.rb | 9 --------- lib/kamal/configuration/docs/configuration.yml | 7 ------- lib/kamal/configuration/docs/proxy.yml | 7 ------- lib/kamal/configuration/proxy.rb | 9 --------- test/commands/app_test.rb | 8 -------- test/commands/proxy_test.rb | 8 -------- test/configuration/proxy_test.rb | 9 --------- test/configuration_test.rb | 9 --------- 11 files changed, 3 insertions(+), 69 deletions(-) diff --git a/lib/kamal/commands/app.rb b/lib/kamal/commands/app.rb index 56a5656b9..6d8f44c60 100644 --- a/lib/kamal/commands/app.rb +++ b/lib/kamal/commands/app.rb @@ -18,7 +18,7 @@ def run(hostname: nil) "--detach", "--restart unless-stopped", "--name", container_name, - *config.network_args, + "--network", "kamal", *([ "--hostname", hostname ] if hostname), "-e", "KAMAL_CONTAINER_NAME=\"#{container_name}\"", "-e", "KAMAL_VERSION=\"#{config.version}\"", diff --git a/lib/kamal/commands/app/execution.rb b/lib/kamal/commands/app/execution.rb index 5770f7aa2..4434c26aa 100644 --- a/lib/kamal/commands/app/execution.rb +++ b/lib/kamal/commands/app/execution.rb @@ -11,7 +11,7 @@ def execute_in_new_container(*command, interactive: false, env:) docker :run, ("-it" if interactive), "--rm", - *config.network_args, + "--network", "kamal", *role&.env_args(host), *argumentize("--env", env), *config.volume_args, diff --git a/lib/kamal/commands/proxy.rb b/lib/kamal/commands/proxy.rb index 3399531fb..acff3dbd6 100644 --- a/lib/kamal/commands/proxy.rb +++ b/lib/kamal/commands/proxy.rb @@ -4,7 +4,7 @@ class Kamal::Commands::Proxy < Kamal::Commands::Base def run docker :run, "--name", container_name, - *config.network_args, + "--network", "kamal", "--detach", "--restart", "unless-stopped", "--volume", "kamal-proxy-config:/home/kamal-proxy/.config/kamal-proxy", diff --git a/lib/kamal/configuration.rb b/lib/kamal/configuration.rb index b26c30c9c..09f1ed895 100644 --- a/lib/kamal/configuration.rb +++ b/lib/kamal/configuration.rb @@ -18,7 +18,6 @@ class Kamal::Configuration PROXY_HTTP_PORT = 80 PROXY_HTTPS_PORT = 443 PROXY_LOG_MAX_SIZE = "10m" - NETWORK = "kamal" class << self def create_from(config_file:, destination: nil, version: nil) @@ -194,10 +193,6 @@ def logging_args logging.args end - def network_args - argumentize "--network", network - end - def readiness_delay raw_config.readiness_delay || 7 @@ -302,10 +297,6 @@ def to_h end private - def network - raw_config["network"] || NETWORK - end - # Will raise ArgumentError if any required config keys are missing def ensure_destination_if_required if require_destination? && destination.nil? diff --git a/lib/kamal/configuration/docs/configuration.yml b/lib/kamal/configuration/docs/configuration.yml index b59394a3d..6b0593468 100644 --- a/lib/kamal/configuration/docs/configuration.yml +++ b/lib/kamal/configuration/docs/configuration.yml @@ -176,10 +176,3 @@ logging: # Alias configuration, see kamal docs alias: aliases: ... - -# Network -# -# The network the application will be attached to. -# -# Defaults to kamal: -network: custom diff --git a/lib/kamal/configuration/docs/proxy.yml b/lib/kamal/configuration/docs/proxy.yml index 0af148261..76ec3e41d 100644 --- a/lib/kamal/configuration/docs/proxy.yml +++ b/lib/kamal/configuration/docs/proxy.yml @@ -103,10 +103,3 @@ proxy: # By default, kamal-proxy will not forward the headers if the `ssl` option is set to `true`, and # will forward them if it is set to `false`. forward_headers: true - - # Network - # - # The network the proxy container will be attached to. - # - # Defaults to kamal: - network: custom diff --git a/lib/kamal/configuration/proxy.rb b/lib/kamal/configuration/proxy.rb index 99c7aa1fa..6232c3e03 100644 --- a/lib/kamal/configuration/proxy.rb +++ b/lib/kamal/configuration/proxy.rb @@ -3,7 +3,6 @@ class Kamal::Configuration::Proxy DEFAULT_LOG_REQUEST_HEADERS = [ "Cache-Control", "Last-Modified", "User-Agent" ] CONTAINER_NAME = "kamal-proxy" - NETWORK = "kamal" delegate :argumentize, :optionize, to: Kamal::Utils @@ -52,10 +51,6 @@ def deploy_command_args(target:) optionize ({ target: "#{target}:#{app_port}" }).merge(deploy_options), with: "=" end - def network_args - argumentize "--network", network - end - def merge(other) self.class.new config: config, proxy_config: proxy_config.deep_merge(other.proxy_config) end @@ -64,8 +59,4 @@ def merge(other) def seconds_duration(value) value ? "#{value}s" : nil end - - def network - proxy_config["network"] || NETWORK - end end diff --git a/test/commands/app_test.rb b/test/commands/app_test.rb index 403e90d4e..0e5cad796 100644 --- a/test/commands/app_test.rb +++ b/test/commands/app_test.rb @@ -64,14 +64,6 @@ class CommandsAppTest < ActiveSupport::TestCase new_command.run.join(" ") end - test "run in custom network" do - @config[:network] = "custom" - - assert_equal \ - "docker run --detach --restart unless-stopped --name app-web-999 --network custom -e KAMAL_CONTAINER_NAME=\"app-web-999\" -e KAMAL_VERSION=\"999\" --env-file .kamal/apps/app/env/roles/web.env --log-opt max-size=\"10m\" --label service=\"app\" --label role=\"web\" --label destination dhh/app:999", - new_command.run.join(" ") - end - test "start" do assert_equal \ "docker start app-web-999", diff --git a/test/commands/proxy_test.rb b/test/commands/proxy_test.rb index 80f420d2d..b7cc9f3dc 100644 --- a/test/commands/proxy_test.rb +++ b/test/commands/proxy_test.rb @@ -27,14 +27,6 @@ class CommandsProxyTest < ActiveSupport::TestCase new_command.run.join(" ") end - test "run in custom network" do - @config[:network] = "custom" - - assert_equal \ - "docker run --name kamal-proxy --network custom --detach --restart unless-stopped --volume kamal-proxy-config:/home/kamal-proxy/.config/kamal-proxy $(cat .kamal/proxy/options || echo \"--publish 80:80 --publish 443:443\") basecamp/kamal-proxy:#{Kamal::Configuration::PROXY_MINIMUM_VERSION}", - new_command.run.join(" ") - end - test "proxy start" do assert_equal \ "docker container start kamal-proxy", diff --git a/test/configuration/proxy_test.rb b/test/configuration/proxy_test.rb index 562c229f6..588e5a350 100644 --- a/test/configuration/proxy_test.rb +++ b/test/configuration/proxy_test.rb @@ -38,15 +38,6 @@ class ConfigurationProxyTest < ActiveSupport::TestCase assert_not config.proxy.ssl? end - test "network_args defaults" do - assert_equal [ "--network", "kamal" ], config.proxy.network_args - end - - test "network_args with configured options" do - @deploy[:proxy] = { "network" => "example" } - assert_equal [ "--network", "example" ], config.proxy.network_args - end - private def config Kamal::Configuration.new(@deploy) diff --git a/test/configuration_test.rb b/test/configuration_test.rb index da53ddb61..c1aaa6971 100644 --- a/test/configuration_test.rb +++ b/test/configuration_test.rb @@ -217,15 +217,6 @@ class ConfigurationTest < ActiveSupport::TestCase assert_equal [ "--log-driver", "\"local\"", "--log-opt", "max-size=\"100m\"", "--log-opt", "max-file=\"5\"" ], config.logging_args end - test "network_args default" do - assert_equal [ "--network", "kamal" ], @config.network_args - end - - test "network_args with configured options" do - config = Kamal::Configuration.new(@deploy.tap { |c| c.merge!(network: "custom") }) - assert_equal [ "--network", "custom" ], config.network_args - end - test "erb evaluation of yml config" do config = Kamal::Configuration.create_from config_file: Pathname.new(File.expand_path("fixtures/deploy.erb.yml", __dir__)) assert_equal "my-user", config.registry.username