Merge branch 'main' into add-support-for-volumes

This commit is contained in:
David Heinemeier Hansson
2023-01-22 16:00:14 +01:00
committed by GitHub
14 changed files with 287 additions and 107 deletions

View File

@@ -60,6 +60,14 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
*command
end
def follow_logs(host:, grep: nil)
run_over_ssh pipe(
current_container_id,
"xargs docker logs -t -n 10 -f 2>&1",
("grep '#{grep}'" if grep)
).join(" "), host: host
end
def console(host:)
exec_over_ssh "bin/rails", "c", host: host
end
@@ -82,7 +90,7 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
private
def exec_over_ssh(*command, host:)
"ssh -t #{config.ssh_user}@#{host} '#{run_exec(*command, interactive: true).join(" ")}'"
run_over_ssh run_exec(*command, interactive: true).join(" "), host: host
end
def service_filter