From 1bb9fe90955c3221a9aa307bff0e929bf0267b93 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 11 Jan 2023 17:11:57 +0100 Subject: [PATCH] Reuse existing exec command --- lib/mrsk/commands/app.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/mrsk/commands/app.rb b/lib/mrsk/commands/app.rb index da756d05..4b1c8c61 100644 --- a/lib/mrsk/commands/app.rb +++ b/lib/mrsk/commands/app.rb @@ -39,8 +39,9 @@ class Mrsk::Commands::App < Mrsk::Commands::Base [ "docker ps -q #{service_filter.join(" ")} | xargs docker logs -f" ] end - def exec(*command) - docker :exec, + def exec(*command, interactive: false) + docker :exec, + ("-it" if interactive), "-e", redact("RAILS_MASTER_KEY=#{config.master_key}"), *config.env_args, config.service_with_version, @@ -48,7 +49,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base end def console - "ssh -t #{config.ssh_user}@#{config.primary_host} 'docker exec -it -e RAILS_MASTER_KEY=#{config.master_key} #{config.env_args.join(" ")} #{config.service_with_version} bin/rails c'" + "ssh -t #{config.ssh_user}@#{config.primary_host} '#{exec("bin/rails", "c", interactive: true).join(" ")}'" end def list_containers