From fb7d9077ff698fc30b1c17f12170bc0ca5f68bcd Mon Sep 17 00:00:00 2001
From: Donal McBreen <donal@basecamp.com>
Date: Fri, 29 Mar 2024 09:26:36 +0000
Subject: [PATCH] Use latest tag for the current destination

---
 lib/kamal/cli/app.rb                | 2 +-
 lib/kamal/commands/app.rb           | 4 ++--
 lib/kamal/configuration.rb          | 6 +++++-
 test/integration/docker-compose.yml | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/kamal/cli/app.rb b/lib/kamal/cli/app.rb
index 93f31dd8..b4de978d 100644
--- a/lib/kamal/cli/app.rb
+++ b/lib/kamal/cli/app.rb
@@ -284,6 +284,6 @@ class Kamal::Cli::App < Kamal::Cli::Base
     end
 
     def version_or_latest
-      options[:version] || "latest"
+      options[:version] || KAMAL.config.latest_tag
     end
 end
diff --git a/lib/kamal/commands/app.rb b/lib/kamal/commands/app.rb
index 5c0b423b..12d35bc6 100644
--- a/lib/kamal/commands/app.rb
+++ b/lib/kamal/commands/app.rb
@@ -50,7 +50,7 @@ class Kamal::Commands::App < Kamal::Commands::Base
 
   def current_running_container_id
     pipe \
-      [ shell(chain(latest_image_container_id, latest_container_id)) ],
+      shell(chain(latest_image_container_id, latest_container_id)),
       [ :head, "-1" ]
   end
 
@@ -60,7 +60,7 @@ class Kamal::Commands::App < Kamal::Commands::Base
 
   def current_running_version
     pipe \
-      [ shell(chain(latest_image_container_name, latest_container_name)) ],
+      shell(chain(latest_image_container_name, latest_container_name)),
       [ :head, "-1" ],
       extract_version_from_name
   end
diff --git a/lib/kamal/configuration.rb b/lib/kamal/configuration.rb
index 75148d55..12aefa78 100644
--- a/lib/kamal/configuration.rb
+++ b/lib/kamal/configuration.rb
@@ -128,7 +128,11 @@ class Kamal::Configuration
   end
 
   def latest_image
-    "#{repository}:#{[ "latest", *destination ].join("-")}"
+    "#{repository}:#{latest_tag}"
+  end
+
+  def latest_tag
+    [ "latest", *destination ].join("-")
   end
 
   def service_with_version
diff --git a/test/integration/docker-compose.yml b/test/integration/docker-compose.yml
index da67f164..5b2c31dc 100644
--- a/test/integration/docker-compose.yml
+++ b/test/integration/docker-compose.yml
@@ -18,7 +18,7 @@ services:
     build:
       context: docker/deployer
     environment:
-      - TEST_ID=${TEST_ID}
+      - TEST_ID=${TEST_ID:-}
     volumes:
       - ../..:/kamal
       - shared:/shared