kamal 1.7.1 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a33d6d0c371102cfe47ba0b15f51059aa1d955667edbfbad137d7a5a56865893
-  data.tar.gz: 065db28e7bfcd285142aa493b4c7cb70a706dfdd58ec504e6f9e4884c35320e3
+  metadata.gz: b854d1899fd480cb305709662f0db5baa42021cb30c800cc465bca4fb0641b19
+  data.tar.gz: 908e6b78735b170123847a5b89b71fc5020442a34bcc40371afad58d3d27484f
 SHA512:
-  metadata.gz: 73a6ce6d0d408024c96b84656958847044c477a9447a12d6861af7a8589f354060b4465100a1873aefa9b4141831751867de7b5181bb71e0353940291712b18d
-  data.tar.gz: 5c3deef19e9759abf5dc7b11a04799c53372097b32055e95543fd68a444e79056c48507646c7c1dfbc6c098a45655983d9791237a68a1c944f3c86ec7361990b
+  metadata.gz: '07691f14dba098e98ed17b91bb4a1529d04a75a9ca895c2d24e35ffd508c9e06f448a3536aa3c9d1b94742c49035861dc17068fba2f2e21e6aabb623589ed868'
+  data.tar.gz: a2da79ca3d4bfbc873838809051569621aa54be6a60edbb0d37eae4ab4610612653a8ce7dddb0ebc70e3f2906b28d431929cdd815c413bcdbdeeb52f030d92bc

data/lib/kamal/cli/build.rb

@@ -43,8 +43,8 @@ class Kamal::Cli::Build < Kamal::Cli::Base
           cli.create
         end
       rescue SSHKit::Command::Failed => e
-        warn "Missing compatible builder, so creating a new one first"
-        if e.message =~ /(context not found|no builder)/
+        if e.message =~ /(context not found|no builder|does not exist)/
+          warn "Missing compatible builder, so creating a new one first"
           cli.create
         else
           raise

data/lib/kamal/cli/templates/sample_hooks/docker-setup.sample

@@ -1,7 +1,13 @@
-#!/bin/sh
+#!/usr/bin/env ruby
 
 # A sample docker-setup hook
 #
-# Sets up a Docker network which can then be used by the application’s containers
+# Sets up a Docker network on defined hosts which can then be used by the application’s containers
 
-ssh user@example.com docker network create kamal
+hosts = ENV["KAMAL_HOSTS"].split(",")
+
+hosts.each do |ip|
+  destination = "root@#{ip}"
+  puts "Creating a Docker network \"kamal\" on #{destination}"
+  `ssh #{destination} docker network create kamal`
+end

data/lib/kamal/configuration/validator.rb

@@ -31,9 +31,9 @@ class Kamal::Configuration::Validator
             validate_array_of! value, example_value.first.class
           elsif example_value.is_a?(Hash)
             case key.to_s
-            when "options"
+            when "options", "args"
               validate_type! value, Hash
-            when "args", "labels"
+            when "labels"
               validate_hash_of! value, example_value.first[1].class
             else
               validate_against_example! value, example_value

data/lib/kamal/version.rb

@@ -1,3 +1,3 @@
 module Kamal
-  VERSION = "1.7.1"
+  VERSION = "1.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kamal
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -314,7 +314,6 @@ files:
 - lib/kamal/configuration/validation.rb
 - lib/kamal/configuration/validator.rb
 - lib/kamal/configuration/validator/accessory.rb
-- lib/kamal/configuration/validator/alias.rb
 - lib/kamal/configuration/validator/builder.rb
 - lib/kamal/configuration/validator/env.rb
 - lib/kamal/configuration/validator/registry.rb

data/lib/kamal/configuration/validator/alias.rb

@@ -1,19 +0,0 @@
-class Kamal::Configuration::Validator::Alias < Kamal::Configuration::Validator
-  def validate!
-    super
-
-    name = context.delete_prefix("aliases/")
-
-    if name !~ /\A[a-z0-9_-]+\z/
-      error "Invalid alias name: '#{name}'. Must only contain lowercase letters, alphanumeric, hyphens and underscores."
-    end
-
-    if Kamal::Cli::Main.original_commands.include?(name)
-      error "Alias '#{name}' conflicts with a built-in command."
-    end
-
-    if config["command"].empty?
-      error "Alias '#{name}': command is required."
-    end
-  end
-end