dash 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 563633a7568cdc7c4567bbe4957af6e5212e37b3ae99ddda0e990552f949762f
-  data.tar.gz: dda127134f2d0ef7fc4e7636ce7132106842855f9084d082a5a3b65c41313b56
+  metadata.gz: 762f586250ded9a4e4f60850a91b1358bd993bcb1d4c6e291dfec93dc6d516e2
+  data.tar.gz: d87d3161396bfdb38f9feb3d3946d0830bdd2b1dc2921e569a275e65f4285cb1
 SHA512:
-  metadata.gz: 8ebab61a7f7f4df70ecd48e5e95415198a01990e6ae6ce93dca062775f2d11b91d2a971bcf9b0b13b4cd3aa6940700c45f8fc73bc1c50be64fe9478e2e1d7ca8
-  data.tar.gz: 5cda006f0c95a79eea3198c9caa089d5e3b3d064860b6d031efe12b65513b2d4219ce04b62b5a9c66532bbda38681ba0ec8dd6cd51143b270588a804be647488
+  metadata.gz: 86a1e05606121be7d85b83c2da117d8bcc2a2badbf080a5e5d0237b3175dd98ac9abba3d1afa154495d6be85923d8ef7d915e3bb877241b69a637ab47de00658
+  data.tar.gz: 9bca1f4085e3ad18ca778eba0dc3344b6592404839fdb4628a2a1bc05d81d869c4b4a837a18f66659f2c0b9fba307da4f14d877f0c088f709d72806a68bf2927

data/lib/dash/cli/proxy/loadbalancer_reboot.rb

@@ -19,6 +19,7 @@ class Dash::Cli::Proxy::LoadbalancerReboot
   def run
     execute *DASH.auditor.record("Rebooted loadbalancer"), verbosity: :debug
     execute *DASH.registry.login
+    ensure_network
 
     info "Stopping and removing #{DASH.loadbalancer.container_name} on #{host}, if running..."
     execute *DASH.loadbalancer.stop, raise_on_non_zero_exit: false
@@ -45,6 +46,16 @@ class Dash::Cli::Proxy::LoadbalancerReboot
   end
 
   private
+    # Before the old container is stopped: `docker run` against a missing
+    # network would otherwise fail with the edge already down. A dedicated
+    # loadbalancer host has no other path that creates the network
+    # (zoolutions/dash#140).
+    def ensure_network
+      execute *DASH.docker.create_network
+    rescue SSHKit::Command::Failed => e
+      raise unless e.message.include?("already exists")
+    end
+
     def wait_until_ready
       deadline = Time.now + READY_TIMEOUT
 

data/lib/dash/cli/proxy.rb

@@ -2,7 +2,7 @@ class Dash::Cli::Proxy < Dash::Cli::Base
   desc "boot", "Boot proxy on servers"
   def boot
     modify(lock: true, server_lock: true) do
-      on(DASH.hosts) do |host|
+      on(network_hosts) do |host|
         execute *DASH.docker.create_network
       rescue SSHKit::Command::Failed => e
         raise unless e.message.include?("already exists")
@@ -76,8 +76,10 @@ class Dash::Cli::Proxy < Dash::Cli::Base
           info "Starting loadbalancer on #{host}..."
           execute *DASH.registry.login
 
-          # Bring a pre-rename volume across before the container can be created
-          # against an empty one. A no-op once it has been.
+          # Bring a pre-rename host across before the container can be created
+          # against an empty volume or a network nothing else joined. A no-op
+          # once it has been.
+          execute *DASH.docker.connect_legacy_network_containers
           execute *DASH.loadbalancer.copy_legacy_config_volume
 
           # The load balancer terminates TLS and owns the cache, so its host
@@ -653,6 +655,15 @@ class Dash::Cli::Proxy < Dash::Cli::Base
   end
 
   private
+    # Every host that runs a container on the proxy network. A dedicated
+    # loadbalancer host is not in DASH.hosts, and nothing else creates the
+    # network there (zoolutions/dash#140).
+    def network_hosts
+      hosts = DASH.hosts
+      hosts |= [ DASH.config.proxy.effective_loadbalancer ] if DASH.config.proxy.load_balancing?
+      hosts
+    end
+
     # The host that owns TLS, and so the certificate store: the loadbalancer
     # host when load balancing (TLS terminates at the edge), else the primary
     # host - the same host `loadbalancer: true` would resolve to.

data/lib/dash/version.rb

@@ -1,3 +1,3 @@
 module Dash
-  VERSION = "4.0.3"
+  VERSION = "4.0.4"
 end

metadata

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