Merge pull request #741 from igor-alexandrov/destination_in_lock

Added destination to the lock directory

lib/kamal/cli/base.rb

@@ -84,7 +84,7 @@ module Kamal::Cli
 
         run_hook "pre-connect"
 
-        ensure_run_directory
+        ensure_run_and_locks_directory
 
         acquire_lock
 
@@ -186,10 +186,14 @@ module Kamal::Cli
         instance_variable_get("@_invocations").first
       end
 
-      def ensure_run_directory
+      def ensure_run_and_locks_directory
         on(KAMAL.hosts) do
           execute(*KAMAL.server.ensure_run_directory)
         end
+
+        on(KAMAL.primary_host) do
+          execute(*KAMAL.lock.ensure_locks_directory)
+        end
       end
   end
 end

lib/kamal/commands/lock.rb

@@ -21,6 +21,10 @@ class Kamal::Commands::Lock < Kamal::Commands::Base
       read_lock_details
   end
 
+  def ensure_locks_directory
+    [ :mkdir, "-p", locks_dir ]
+  end
+
   private
     def write_lock_details(message, version)
       write \
@@ -40,12 +44,18 @@ class Kamal::Commands::Lock < Kamal::Commands::Base
         "/dev/null"
     end
 
+    def locks_dir
+      File.join(config.run_directory, "locks")
+    end
+
     def lock_dir
-      "#{config.run_directory}/lock-#{config.service}"
+      dir_name = [ config.service, config.destination ].compact.join("-")
+
+      File.join(locks_dir, dir_name)
     end
 
     def lock_details_file
-      [ lock_dir, :details ].join("/")
+      File.join(lock_dir, "details")
     end
 
     def lock_details(message, version)