Merge branch 'main' into accessories

lib/mrsk/commands/app.rb

@@ -10,6 +10,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
       "--name", config.service_with_version,
       *rails_master_key_arg,
       *role.env_args,
+      *config.volume_args,
       *role.label_args,
       config.absolute_image,
       role.cmd
@@ -43,6 +44,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
       ("-it" if interactive),
       *rails_master_key_arg,
       *config.env_args,
+      *config.volume_args,
       config.service_with_version,
       *command
   end
@@ -53,6 +55,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
       "--rm",
       *rails_master_key_arg,
       *config.env_args,
+      *config.volume_args,
       config.absolute_image,
       *command
   end

lib/mrsk/configuration.rb

@@ -98,6 +98,14 @@ class Mrsk::Configuration
     end
   end
 
+  def volume_args
+    if config.volumes.present?
+      config.volumes.map { |volume| "--volume #{volume}" }
+    else
+      []
+    end
+  end
+
   def ssh_user
     raw_config.ssh_user || "root"
   end
@@ -120,8 +128,10 @@ class Mrsk::Configuration
       absolute_image: absolute_image,
       service_with_version: service_with_version,
       env_args: env_args,
+      volume_args: volume_args,
       ssh_options: ssh_options,
       builder: raw_config.builder
+      builder: config.builder
     }.compact
   end