dash 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 749c8e286224f96b085fc8c325affcfde1cafaa18824e1405f880cc1aea966b1
-  data.tar.gz: 0dab0ae01b69f742e58551caaeee3352f98548c5a6265e98fcbe2de3025b50d1
+  metadata.gz: 8651f7a91510814ccfa26283d3aef0f364caa5c99419a76ee6cdb15820680148
+  data.tar.gz: aef6a718f6f4d1427d6e20f73e3096eed8436426e32b6c6ea0a40f52e3588261
 SHA512:
-  metadata.gz: 7b8a1e07a72a34388817185a8e476b4c400a90061292fe9d143a9a67ab1e5e5d2a87cba154077d151922a306f577dce9d04d60ecef371296ca9b2e3c49a277cb
-  data.tar.gz: 5b396df37122ed76ff2e5b7b2b694940a9eb1bcaa5bf31ed0de3f01039bf59836224f225da0a59acc24445f1d6a3dfe19165f2c83fd2e4a4023e68a1ec41c2c6
+  metadata.gz: da7a30a00bf6f622aeeb13889670133285a202c5c4481a7b83cc8d980624db48a0c5d8007e0efaf723489d4ea20672999dc8791e5ff4240b6f4fa65ba54a7380
+  data.tar.gz: cdcf6391c305f5e84125687bb6f4174729a7c09819a08a5c8a26bd8de2fd5b10933606387f581187c94151574c2607d803689e3d97c2cffa00beab9e26375f09

data/lib/dash/cli/doctor/host_checks.rb

@@ -61,12 +61,17 @@ class Dash::Cli::Doctor::HostChecks
 
     def proxy_checks
       version, version_error = capture_proxy_version
+      # A host that has not been through the stage-3c rename is still running
+      # kamal-proxy. Without asking about it too, the version check reports "not
+      # running" and the ports check blames a foreign process for the ports that
+      # container legitimately holds — failing the very deploy that migrates it.
+      legacy_version = version.present? ? nil : capture_legacy_proxy_version
 
       {
         proxy_image: proxy_image_check,
-        proxy_version: proxy_version_check(version, version_error),
+        proxy_version: proxy_version_check(version, version_error, legacy_version),
         proxy_socket: proxy_socket_check(proxy_running: version.present?),
-        ports: ports_check(proxy_running: version.present?)
+        ports: ports_check(proxy_running: version.present?, legacy_proxy_running: legacy_version.present?)
       }
     end
 
@@ -76,6 +81,14 @@ class Dash::Cli::Doctor::HostChecks
       [ nil, e ]
     end
 
+    # Best-effort: a host with no legacy container simply reports nothing, and
+    # any error here must not turn into a failing check of its own.
+    def capture_legacy_proxy_version
+      capture_with_info(*DASH.proxy(host).version(name: Dash::Configuration::Proxy::LEGACY_CONTAINER_NAME)).strip.presence
+    rescue StandardError
+      nil
+    end
+
     def proxy_image_check
       image = expected_proxy_image
 
@@ -88,11 +101,15 @@ class Dash::Cli::Doctor::HostChecks
       result :proxy_image, :fail, "#{e.class}: #{e.message}"
     end
 
-    def proxy_version_check(version, error)
+    def proxy_version_check(version, error, legacy_version = nil)
       minimum = Dash::Configuration::Proxy::Run::MINIMUM_VERSION
 
       if error
         result :proxy_version, :warn, "could not determine the running version (#{error.message})"
+      elsif version.nil? && legacy_version.present?
+        result :proxy_version, :ok,
+          "#{Dash::Configuration::Proxy::LEGACY_CONTAINER_NAME} #{legacy_version} is running; it is renamed to " \
+          "#{Dash::Configuration::Proxy::CONTAINER_NAME} on the next deploy, which briefly interrupts this host"
       elsif version.nil?
         result :proxy_version, :ok, "not running (will be started on deploy)"
       elsif Dash::Utils.older_version?(version, minimum)
@@ -146,7 +163,7 @@ class Dash::Cli::Doctor::HostChecks
       DASH.config.roles.any? { |role| role.running_proxy? && role.proxy.proxy_config["sleep"].present? }
     end
 
-    def ports_check(proxy_running:)
+    def ports_check(proxy_running:, legacy_proxy_running: false)
       run_config = DASH.config.proxy_run(host)
       return result(:ports, :ok, "proxy ports are not published, nothing to check") if run_config && !run_config.publish?
 
@@ -155,6 +172,10 @@ class Dash::Cli::Doctor::HostChecks
 
       if proxy_running
         result :ports, :ok, "ports #{http_port}/#{https_port} held by the running dash-proxy"
+      elsif legacy_proxy_running
+        result :ports, :ok,
+          "ports #{http_port}/#{https_port} held by the running #{Dash::Configuration::Proxy::LEGACY_CONTAINER_NAME}, " \
+          "replaced on the next deploy"
       elsif (busy = busy_ports(http_port, https_port)).any?
         result :ports, :fail, "port(s) #{busy.join(", ")} already in use by another process"
       else

data/lib/dash/commands/proxy.rb

@@ -106,9 +106,12 @@ class Dash::Commands::Proxy < Dash::Commands::Base
     docker :ps, "--filter", "'name=^#{container_name}$'"
   end
 
-  def version
+  # `name:` so the doctor can also ask about the pre-rename container: during
+  # the stage-3c transition a host still runs kamal-proxy, and a check that only
+  # ever looks at dash-proxy concludes no proxy is running.
+  def version(name: container_name)
     pipe \
-      docker(:inspect, container_name, "--format '{{.Config.Image}}'"),
+      docker(:inspect, name, "--format '{{.Config.Image}}'"),
       [ :awk, "-F:", "'{print \$NF}'" ]
   end
 

data/lib/dash/version.rb

@@ -1,3 +1,3 @@
 module Dash
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dash
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Mikael Henriksson