Compare commits
9 Commits
kamal-prox
...
v2.1.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
279bda2770 | ||
|
|
aa15fa532a | ||
|
|
276b469c2b | ||
|
|
c10b3fb07a | ||
|
|
f47fd13e5b | ||
|
|
1d8c40f5d2 | ||
|
|
73c78079bc | ||
|
|
cd12f95a97 | ||
|
|
190f4fba28 |
@@ -1,7 +1,7 @@
|
|||||||
PATH
|
PATH
|
||||||
remote: .
|
remote: .
|
||||||
specs:
|
specs:
|
||||||
kamal (2.0.0)
|
kamal (2.1.0)
|
||||||
activesupport (>= 7.0)
|
activesupport (>= 7.0)
|
||||||
base64 (~> 0.2)
|
base64 (~> 0.2)
|
||||||
bcrypt_pbkdf (~> 1.0)
|
bcrypt_pbkdf (~> 1.0)
|
||||||
|
|||||||
@@ -203,7 +203,7 @@ class Kamal::Cli::App < Kamal::Cli::Base
|
|||||||
run_locally do
|
run_locally do
|
||||||
info "Following logs on #{KAMAL.primary_host}..."
|
info "Following logs on #{KAMAL.primary_host}..."
|
||||||
|
|
||||||
KAMAL.specific_roles ||= [ "web" ]
|
KAMAL.specific_roles ||= [ KAMAL.primary_role.name ]
|
||||||
role = KAMAL.roles_on(KAMAL.primary_host).first
|
role = KAMAL.roles_on(KAMAL.primary_host).first
|
||||||
|
|
||||||
app = KAMAL.app(role: role, host: host)
|
app = KAMAL.app(role: role, host: host)
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ class Kamal::Configuration
|
|||||||
|
|
||||||
class << self
|
class << self
|
||||||
def create_from(config_file:, destination: nil, version: nil)
|
def create_from(config_file:, destination: nil, version: nil)
|
||||||
|
ENV["KAMAL_DESTINATION"] = destination
|
||||||
|
|
||||||
raw_config = load_config_files(config_file, *destination_config_file(config_file, destination))
|
raw_config = load_config_files(config_file, *destination_config_file(config_file, destination))
|
||||||
|
|
||||||
new raw_config, destination: destination, version: version
|
new raw_config, destination: destination, version: version
|
||||||
|
|||||||
@@ -61,3 +61,10 @@ ssh:
|
|||||||
# An array of strings, with each element of the array being
|
# An array of strings, with each element of the array being
|
||||||
# a raw private key in PEM format.
|
# a raw private key in PEM format.
|
||||||
key_data: [ "-----BEGIN OPENSSH PRIVATE KEY-----" ]
|
key_data: [ "-----BEGIN OPENSSH PRIVATE KEY-----" ]
|
||||||
|
|
||||||
|
# Config
|
||||||
|
#
|
||||||
|
# Set to true to load the default OpenSSH config files (~/.ssh/config,
|
||||||
|
# /etc/ssh_config), to false ignore config files, or to a file path
|
||||||
|
# (or array of paths) to load specific configuration. Defaults to true.
|
||||||
|
config: true
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
module Kamal
|
module Kamal
|
||||||
VERSION = "2.0.0"
|
VERSION = "2.1.0"
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -222,6 +222,13 @@ class ConfigurationTest < ActiveSupport::TestCase
|
|||||||
assert_equal "my-user", config.registry.username
|
assert_equal "my-user", config.registry.username
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "destination is loaded into env" do
|
||||||
|
dest_config_file = Pathname.new(File.expand_path("fixtures/deploy_for_dest.yml", __dir__))
|
||||||
|
|
||||||
|
config = Kamal::Configuration.create_from config_file: dest_config_file, destination: "world"
|
||||||
|
assert_equal ENV["KAMAL_DESTINATION"], "world"
|
||||||
|
end
|
||||||
|
|
||||||
test "destination yml config merge" do
|
test "destination yml config merge" do
|
||||||
dest_config_file = Pathname.new(File.expand_path("fixtures/deploy_for_dest.yml", __dir__))
|
dest_config_file = Pathname.new(File.expand_path("fixtures/deploy_for_dest.yml", __dir__))
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user