From c611a1616a5547dbe3b9da1ce40371a599bfe293 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 2 May 2023 14:06:06 +0200 Subject: [PATCH] Distinguish from server dependencies --- lib/mrsk/cli/build.rb | 2 +- lib/mrsk/commands/builder.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/mrsk/cli/build.rb b/lib/mrsk/cli/build.rb index 75558812..9831f4e6 100644 --- a/lib/mrsk/cli/build.rb +++ b/lib/mrsk/cli/build.rb @@ -87,7 +87,7 @@ class Mrsk::Cli::Build < Mrsk::Cli::Base def verify_dependencies run_locally do begin - execute *MRSK.builder.ensure_dependencies_installed + execute *MRSK.builder.ensure_local_dependencies_installed rescue SSHKit::Command::Failed => e build_error = e.message =~ /command not found/ ? "Docker is not installed locally" : diff --git a/lib/mrsk/commands/builder.rb b/lib/mrsk/commands/builder.rb index f7710b37..58ca626e 100644 --- a/lib/mrsk/commands/builder.rb +++ b/lib/mrsk/commands/builder.rb @@ -35,22 +35,22 @@ class Mrsk::Commands::Builder < Mrsk::Commands::Base end - def ensure_dependencies_installed + def ensure_local_dependencies_installed if name.native? - ensure_docker_installed + ensure_local_docker_installed else combine \ - ensure_docker_installed, - ensure_buildx_installed + ensure_local_docker_installed, + ensure_local_buildx_installed end end private - def ensure_docker_installed + def ensure_local_docker_installed docker "--version" end - def ensure_buildx_installed + def ensure_local_buildx_installed docker :buildx, "version" end end