Start before stopping and longer timeouts

lib/mrsk/cli/app.rb

@@ -10,13 +10,17 @@ class Mrsk::Cli::App < Mrsk::Cli::Base
           execute *MRSK.auditor.record("Booted app version #{version}"), verbosity: :debug
 
           begin
-            execute *MRSK.app.stop, raise_on_non_zero_exit: false
+            old_version = capture_with_info(*MRSK.app.current_running_version).strip
             execute *MRSK.app.run(role: role.name)
+            sleep 10
+            execute *MRSK.app.stop(version: old_version), raise_on_non_zero_exit: false if old_version.present?
+
           rescue SSHKit::Command::Failed => e
             if e.message =~ /already in use/
-              error "Rebooting container with same version already deployed on #{host}"
+              error "Rebooting container with same version #{version} already deployed on #{host}"
               execute *MRSK.auditor.record("Rebooted app version #{version}"), verbosity: :debug
 
+              execute *MRSK.app.stop(version: version)
               execute *MRSK.app.remove_container(version: version)
               execute *MRSK.app.run(role: role.name)
             else

lib/mrsk/cli/healthcheck.rb

@@ -1,5 +1,5 @@
 class Mrsk::Cli::Healthcheck < Mrsk::Cli::Base
-  MAX_ATTEMPTS = 5
+  MAX_ATTEMPTS = 7
 
   class HealthcheckError < StandardError; end
 

lib/mrsk/cli/main.rb

@@ -55,11 +55,14 @@ class Mrsk::Cli::Main < Mrsk::Cli::Base
     MRSK.version = version
 
     if container_name_available?(MRSK.config.service_with_version)
-      say "Stop current version, then start version #{version}...", :magenta
+      say "Start version #{version}, then stop the old version...", :magenta
 
       on(MRSK.hosts) do |host|
-        execute *MRSK.app.stop, raise_on_non_zero_exit: false
+        old_version = capture_with_info(*MRSK.app.current_running_version).strip.presence
+
         execute *MRSK.app.start
+        sleep 10
+        execute *MRSK.app.stop(version: old_version), raise_on_non_zero_exit: false
       end
 
       audit_broadcast "Rolled back app to version #{version}"

lib/mrsk/commands/app.rb

@@ -18,8 +18,10 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
     docker :start, service_with_version
   end
 
-  def stop
-    pipe current_container_id, xargs(docker(:stop))
+  def stop(version: nil)
+    pipe \
+      version ? container_id_for_version(version) : current_container_id,
+      xargs(docker(:stop))
   end
 
   def info
@@ -132,6 +134,10 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
       end
     end
 
+    def container_id_for_version(version)
+      container_id_for(container_name: service_with_version(version))    
+    end
+
     def service_filter
       [ "--filter", "label=service=#{config.service}" ]
     end

lib/mrsk/configuration/role.rb

@@ -61,7 +61,7 @@ class Mrsk::Configuration::Role
           "traefik.http.routers.#{config.service}.rule" => "PathPrefix(`/`)",
           "traefik.http.services.#{config.service}.loadbalancer.healthcheck.path" => config.healthcheck["path"],
           "traefik.http.services.#{config.service}.loadbalancer.healthcheck.interval" => "1s",
-          "traefik.http.middlewares.#{config.service}.retry.attempts" => "3",
+          "traefik.http.middlewares.#{config.service}.retry.attempts" => "5",
           "traefik.http.middlewares.#{config.service}.retry.initialinterval" => "500ms"
         }
       else