Merge pull request #580 from happyscribe/feat/no-web

Allow Kamal to run without traefik

lib/kamal/cli/healthcheck.rb

@@ -3,6 +3,7 @@ class Kamal::Cli::Healthcheck < Kamal::Cli::Base
 
   desc "perform", "Health check current app version"
   def perform
+    raise "The primary host is not configured to run Traefik" unless KAMAL.config.role(KAMAL.config.primary_role).running_traefik?
     on(KAMAL.primary_host) do
       begin
         execute *KAMAL.healthcheck.run

lib/kamal/cli/main.rb

@@ -38,8 +38,10 @@ class Kamal::Cli::Main < Kamal::Cli::Base
         say "Ensure Traefik is running...", :magenta
         invoke "kamal:cli:traefik:boot", [], invoke_options
 
-        say "Ensure app can pass healthcheck...", :magenta
-        invoke "kamal:cli:healthcheck:perform", [], invoke_options
+        if KAMAL.config.role(KAMAL.config.primary_role).running_traefik?
+          say "Ensure app can pass healthcheck...", :magenta
+          invoke "kamal:cli:healthcheck:perform", [], invoke_options
+        end
 
         say "Detect stale containers...", :magenta
         invoke "kamal:cli:app:stale_containers", [], invoke_options.merge(stop: true)

lib/kamal/cli/templates/deploy.yml

@@ -84,13 +84,12 @@ registry:
 #   limit: 10 # Can also specify as a percentage of total hosts, such as "25%"
 #   wait: 2
 
-# Configure the role used to determine the primary_web_host. This host takes
+# Configure the role used to determine the primary_host. This host takes
 # deploy locks, runs health checks during the deploy, and follow logs, etc.
-# This role should have traefik enabled.
 #
 # Caution: there's no support for role renaming yet, so be careful to cleanup
 #          the previous role on the deployed hosts.
-# primary_web_role: web
+# primary_role: web
 
 # Controls if we abort when see a role with no hosts. Disabling this may be
 # useful for more complex deploy configurations.

lib/kamal/commander.rb

@@ -24,7 +24,7 @@ class Kamal::Commander
   attr_reader :specific_roles, :specific_hosts
 
   def specific_primary!
-    self.specific_hosts = [ config.primary_web_host ]
+    self.specific_hosts = [ config.primary_host ]
   end
 
   def specific_roles=(role_names)
@@ -36,7 +36,7 @@ class Kamal::Commander
   end
 
   def primary_host
-    specific_hosts&.first || specific_roles&.first&.primary_host || config.primary_web_host
+    specific_hosts&.first || specific_roles&.first&.primary_host || config.primary_host
   end
 
   def primary_role

lib/kamal/commands/healthcheck.rb

@@ -1,7 +1,7 @@
 class Kamal::Commands::Healthcheck < Kamal::Commands::Base
 
   def run
-    web = config.role(config.primary_web_role)
+    primary = config.role(config.primary_role)
 
     docker :run,
       "--detach",
@@ -9,12 +9,12 @@ class Kamal::Commands::Healthcheck < Kamal::Commands::Base
       "--publish", "#{exposed_port}:#{config.healthcheck["port"]}",
       "--label", "service=#{config.healthcheck_service}",
       "-e", "KAMAL_CONTAINER_NAME=\"#{config.healthcheck_service}\"",
-      *web.env_args,
-      *web.health_check_args(cord: false),
+      *primary.env_args,
+      *primary.health_check_args(cord: false),
       *config.volume_args,
-      *web.option_args,
+      *primary.option_args,
       config.absolute_image,
-      web.cmd
+      primary.cmd
   end
 
   def status

lib/kamal/configuration.rb

@@ -91,8 +91,8 @@ class Kamal::Configuration
     roles.flat_map(&:hosts).uniq
   end
 
-  def primary_web_host
-    role(primary_web_role)&.primary_host
+  def primary_host
+    role(primary_role)&.primary_host
   end
 
   def traefik_roles
@@ -208,8 +208,8 @@ class Kamal::Configuration
     raw_config.asset_path
   end
 
-  def primary_web_role
-    raw_config.primary_web_role || "web"
+  def primary_role
+    raw_config.primary_role || "web"
   end
 
   def allow_empty_roles?
@@ -225,7 +225,7 @@ class Kamal::Configuration
     {
       roles: role_names,
       hosts: all_hosts,
-      primary_host: primary_web_host,
+      primary_host: primary_host,
       version: version,
       repository: repository,
       absolute_image: absolute_image,
@@ -264,16 +264,12 @@ class Kamal::Configuration
         raise ArgumentError, "You must specify a password for the registry in config/deploy.yml (or set the ENV variable if that's used)"
       end
 
-      unless role_names.include?(primary_web_role)
-        raise ArgumentError, "The primary_web_role #{primary_web_role} isn't defined"
+      unless role_names.include?(primary_role)
+        raise ArgumentError, "The primary_role #{primary_role} isn't defined"
       end
 
-      unless traefik_role_names.include?(primary_web_role)
-        raise ArgumentError, "Role #{primary_web_role} needs to have traefik enabled"
-      end
-
-      if role(primary_web_role).hosts.empty?
-        raise ArgumentError, "No servers specified for the #{primary_web_role} primary_web_role"
+      if role(primary_role).hosts.empty?
+        raise ArgumentError, "No servers specified for the #{primary_role} primary_role"
       end
 
       unless allow_empty_roles?

lib/kamal/configuration/role.rb

@@ -93,7 +93,15 @@ class Kamal::Configuration::Role
 
 
   def running_traefik?
-    name.web? || specializations["traefik"]
+    if specializations["traefik"].nil?
+      primary?
+    else
+      specializations["traefik"]
+    end
+  end
+
+  def primary?
+    @config.primary_role == name
   end