Reverted network arguments everywhere except to accessory config

lib/kamal/commands/app.rb

@@ -18,7 +18,7 @@ class Kamal::Commands::App < Kamal::Commands::Base
       "--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}\"",

lib/kamal/commands/app/execution.rb

@@ -11,7 +11,7 @@ module Kamal::Commands::App::Execution
     docker :run,
       ("-it" if interactive),
       "--rm",
-      *config.network_args,
+      "--network", "kamal",
       *role&.env_args(host),
       *argumentize("--env", env),
       *config.volume_args,

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",

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 @@ class Kamal::Configuration
     logging.args
   end
 
-  def network_args
-    argumentize "--network", network
-  end
-
 
   def readiness_delay
     raw_config.readiness_delay || 7
@@ -302,10 +297,6 @@ class Kamal::Configuration
   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?

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

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

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 @@ class Kamal::Configuration::Proxy
     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 @@ class Kamal::Configuration::Proxy
     def seconds_duration(value)
       value ? "#{value}s" : nil
     end
-
-    def network
-      proxy_config["network"] || NETWORK
-    end
 end

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",

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",

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)

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