kamal 1.7.0 → 1.7.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/kamal/cli/app/boot.rb +2 -2
- data/lib/kamal/cli/app.rb +1 -1
- data/lib/kamal/cli/build.rb +2 -2
- data/lib/kamal/cli/main.rb +1 -0
- data/lib/kamal/configuration/validator/alias.rb +19 -0
- data/lib/kamal/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 88a235b000a74c9b34e55924be1c372ebd7e59b0c0bde140f0b8c8b311614e96
|
4
|
+
data.tar.gz: 7193b72065b8eeab2dbe761ae93383d9c44663104d46b37f93b32fbef00be84a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 58d4e970cd573e766a1580eb5f4d343941d2bf68518fc43840776422ba9d04c89210ad25b4f72b07268920e79c483f1f2ab57c2cb440ad96c372c0447775a0ab
|
7
|
+
data.tar.gz: 98e87cc46ad4e88fadb38257c5cc48b7a71c4b87121a75aa8f6bfcac290e97c7cc357351564f6b0167e35f6a2472b4a20e9e27ed21721a285c794dc7b9ab5cbe
|
data/lib/kamal/cli/app/boot.rb
CHANGED
@@ -72,7 +72,7 @@ class Kamal::Cli::App::Boot
|
|
72
72
|
|
73
73
|
def release_barrier
|
74
74
|
if barrier.open
|
75
|
-
info "First #{KAMAL.primary_role} container is healthy on #{host}, booting other roles"
|
75
|
+
info "First #{KAMAL.primary_role} container is healthy on #{host}, booting any other roles"
|
76
76
|
end
|
77
77
|
end
|
78
78
|
|
@@ -87,7 +87,7 @@ class Kamal::Cli::App::Boot
|
|
87
87
|
|
88
88
|
def close_barrier
|
89
89
|
if barrier.close
|
90
|
-
info "First #{KAMAL.primary_role} container is unhealthy on #{host}, not booting other roles"
|
90
|
+
info "First #{KAMAL.primary_role} container is unhealthy on #{host}, not booting any other roles"
|
91
91
|
error capture_with_info(*app.logs(version: version))
|
92
92
|
error capture_with_info(*app.container_health_log(version: version))
|
93
93
|
end
|
data/lib/kamal/cli/app.rb
CHANGED
@@ -14,7 +14,7 @@ class Kamal::Cli::App < Kamal::Cli::Base
|
|
14
14
|
end
|
15
15
|
|
16
16
|
# Primary hosts and roles are returned first, so they can open the barrier
|
17
|
-
barrier = Kamal::Cli::Healthcheck::Barrier.new
|
17
|
+
barrier = Kamal::Cli::Healthcheck::Barrier.new
|
18
18
|
|
19
19
|
on(KAMAL.hosts, **KAMAL.boot_strategy) do |host|
|
20
20
|
KAMAL.roles_on(host).each do |role|
|
data/lib/kamal/cli/build.rb
CHANGED
@@ -43,8 +43,8 @@ class Kamal::Cli::Build < Kamal::Cli::Base
|
|
43
43
|
cli.create
|
44
44
|
end
|
45
45
|
rescue SSHKit::Command::Failed => e
|
46
|
-
|
47
|
-
|
46
|
+
if e.message =~ /(context not found|no builder|does not exist)/
|
47
|
+
warn "Missing compatible builder, so creating a new one first"
|
48
48
|
cli.create
|
49
49
|
else
|
50
50
|
raise
|
data/lib/kamal/cli/main.rb
CHANGED
@@ -11,6 +11,7 @@ class Kamal::Cli::Main < Kamal::Cli::Base
|
|
11
11
|
|
12
12
|
say "Evaluate and push env files...", :magenta
|
13
13
|
invoke "kamal:cli:main:envify", [], invoke_options
|
14
|
+
invoke "kamal:cli:env:push", [], invoke_options
|
14
15
|
|
15
16
|
invoke "kamal:cli:accessory:boot", [ "all" ], invoke_options
|
16
17
|
deploy
|
@@ -0,0 +1,19 @@
|
|
1
|
+
class Kamal::Configuration::Validator::Alias < Kamal::Configuration::Validator
|
2
|
+
def validate!
|
3
|
+
super
|
4
|
+
|
5
|
+
name = context.delete_prefix("aliases/")
|
6
|
+
|
7
|
+
if name !~ /\A[a-z0-9_-]+\z/
|
8
|
+
error "Invalid alias name: '#{name}'. Must only contain lowercase letters, alphanumeric, hyphens and underscores."
|
9
|
+
end
|
10
|
+
|
11
|
+
if Kamal::Cli::Main.original_commands.include?(name)
|
12
|
+
error "Alias '#{name}' conflicts with a built-in command."
|
13
|
+
end
|
14
|
+
|
15
|
+
if config["command"].empty?
|
16
|
+
error "Alias '#{name}': command is required."
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
data/lib/kamal/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kamal
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.7.
|
4
|
+
version: 1.7.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- David Heinemeier Hansson
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2024-06-
|
11
|
+
date: 2024-06-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -314,6 +314,7 @@ files:
|
|
314
314
|
- lib/kamal/configuration/validation.rb
|
315
315
|
- lib/kamal/configuration/validator.rb
|
316
316
|
- lib/kamal/configuration/validator/accessory.rb
|
317
|
+
- lib/kamal/configuration/validator/alias.rb
|
317
318
|
- lib/kamal/configuration/validator/builder.rb
|
318
319
|
- lib/kamal/configuration/validator/env.rb
|
319
320
|
- lib/kamal/configuration/validator/registry.rb
|