Added tests for network configuration option
This commit is contained in:
@@ -90,3 +90,11 @@ accessories:
|
|||||||
# They are not created or copied before mounting:
|
# They are not created or copied before mounting:
|
||||||
volumes:
|
volumes:
|
||||||
- /path/to/mysql-logs:/var/log/mysql
|
- /path/to/mysql-logs:/var/log/mysql
|
||||||
|
|
||||||
|
# Network
|
||||||
|
#
|
||||||
|
# The network the accessory will be attached to.
|
||||||
|
#
|
||||||
|
# Defaults to kamal:
|
||||||
|
network: custom
|
||||||
|
|
||||||
|
|||||||
@@ -176,3 +176,10 @@ logging:
|
|||||||
# Alias configuration, see kamal docs alias:
|
# Alias configuration, see kamal docs alias:
|
||||||
aliases:
|
aliases:
|
||||||
...
|
...
|
||||||
|
|
||||||
|
# Network
|
||||||
|
#
|
||||||
|
# The network the application will be attached to.
|
||||||
|
#
|
||||||
|
# Defaults to kamal:
|
||||||
|
network: custom
|
||||||
|
|||||||
@@ -103,3 +103,10 @@ proxy:
|
|||||||
# By default, kamal-proxy will not forward the headers if the `ssl` option is set to `true`, and
|
# 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`.
|
# will forward them if it is set to `false`.
|
||||||
forward_headers: true
|
forward_headers: true
|
||||||
|
|
||||||
|
# Network
|
||||||
|
#
|
||||||
|
# The network the proxy container will be attached to.
|
||||||
|
#
|
||||||
|
# Defaults to kamal:
|
||||||
|
network: custom
|
||||||
|
|||||||
@@ -152,4 +152,13 @@ class ConfigurationAccessoryTest < ActiveSupport::TestCase
|
|||||||
test "options" do
|
test "options" do
|
||||||
assert_equal [ "--cpus", "\"4\"", "--memory", "\"2GB\"" ], @config.accessory(:redis).option_args
|
assert_equal [ "--cpus", "\"4\"", "--memory", "\"2GB\"" ], @config.accessory(:redis).option_args
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "network_args default" do
|
||||||
|
assert_equal [ "--network", "kamal" ], @config.accessory(:mysql).network_args
|
||||||
|
end
|
||||||
|
|
||||||
|
test "network_args with configured options" do
|
||||||
|
@deploy[:accessories]["mysql"]["network"] = "database"
|
||||||
|
assert_equal [ "--network", "database" ], @config.accessory(:mysql).network_args
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -38,6 +38,15 @@ class ConfigurationProxyTest < ActiveSupport::TestCase
|
|||||||
assert_not config.proxy.ssl?
|
assert_not config.proxy.ssl?
|
||||||
end
|
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
|
private
|
||||||
def config
|
def config
|
||||||
Kamal::Configuration.new(@deploy)
|
Kamal::Configuration.new(@deploy)
|
||||||
|
|||||||
@@ -217,6 +217,15 @@ class ConfigurationTest < ActiveSupport::TestCase
|
|||||||
assert_equal [ "--log-driver", "\"local\"", "--log-opt", "max-size=\"100m\"", "--log-opt", "max-file=\"5\"" ], config.logging_args
|
assert_equal [ "--log-driver", "\"local\"", "--log-opt", "max-size=\"100m\"", "--log-opt", "max-file=\"5\"" ], config.logging_args
|
||||||
end
|
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
|
test "erb evaluation of yml config" do
|
||||||
config = Kamal::Configuration.create_from config_file: Pathname.new(File.expand_path("fixtures/deploy.erb.yml", __dir__))
|
config = Kamal::Configuration.create_from config_file: Pathname.new(File.expand_path("fixtures/deploy.erb.yml", __dir__))
|
||||||
assert_equal "my-user", config.registry.username
|
assert_equal "my-user", config.registry.username
|
||||||
|
|||||||
Reference in New Issue
Block a user