diff --git a/lib/mrsk/cli/app.rb b/lib/mrsk/cli/app.rb index e9b9fdb7..431608ee 100644 --- a/lib/mrsk/cli/app.rb +++ b/lib/mrsk/cli/app.rb @@ -63,6 +63,17 @@ class Mrsk::Cli::App < Mrsk::Cli::Base end end + desc "bash", "Start a bash session on primary host" + option :host, desc: "Start bash on a different host" + def bash + host = options[:host] || MRSK.config.primary_host + + run_locally do + puts "Launching bash session on #{host}..." + exec MRSK.app.bash(host: host) + end + end + desc "runner [EXPRESSION]", "Execute Rails runner with given expression" option :once, type: :boolean, default: false, desc: "Only perform runner on primary host" def runner(expression) diff --git a/lib/mrsk/commands/app.rb b/lib/mrsk/commands/app.rb index b58389b2..14c1f3fa 100644 --- a/lib/mrsk/commands/app.rb +++ b/lib/mrsk/commands/app.rb @@ -47,8 +47,9 @@ class Mrsk::Commands::App < Mrsk::Commands::Base *command end - def run_exec(*command) + def run_exec(*command, interactive: false) docker :run, + ("-it" if interactive), "--rm", *rails_master_key_arg, *config.env_args, @@ -57,7 +58,11 @@ class Mrsk::Commands::App < Mrsk::Commands::Base end def console(host: config.primary_host) - "ssh -t #{config.ssh_user}@#{host} '#{exec("bin/rails", "c", interactive: true).join(" ")}'" + exec_over_ssh "bin/rails", "c", host: host + end + + def bash(host: config.primary_host) + exec_over_ssh "bash", host: host end def list_containers @@ -73,6 +78,10 @@ class Mrsk::Commands::App < Mrsk::Commands::Base end private + def exec_over_ssh(*command, host:) + "ssh -t #{config.ssh_user}@#{host} '#{run_exec(*command, interactive: true).join(" ")}'" + end + def service_filter [ "--filter", "label=service=#{config.service}" ] end