Distinguish from server dependencies
This commit is contained in:
@@ -87,7 +87,7 @@ class Mrsk::Cli::Build < Mrsk::Cli::Base
|
|||||||
def verify_dependencies
|
def verify_dependencies
|
||||||
run_locally do
|
run_locally do
|
||||||
begin
|
begin
|
||||||
execute *MRSK.builder.ensure_dependencies_installed
|
execute *MRSK.builder.ensure_local_dependencies_installed
|
||||||
rescue SSHKit::Command::Failed => e
|
rescue SSHKit::Command::Failed => e
|
||||||
build_error = e.message =~ /command not found/ ?
|
build_error = e.message =~ /command not found/ ?
|
||||||
"Docker is not installed locally" :
|
"Docker is not installed locally" :
|
||||||
|
|||||||
@@ -35,22 +35,22 @@ class Mrsk::Commands::Builder < Mrsk::Commands::Base
|
|||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
def ensure_dependencies_installed
|
def ensure_local_dependencies_installed
|
||||||
if name.native?
|
if name.native?
|
||||||
ensure_docker_installed
|
ensure_local_docker_installed
|
||||||
else
|
else
|
||||||
combine \
|
combine \
|
||||||
ensure_docker_installed,
|
ensure_local_docker_installed,
|
||||||
ensure_buildx_installed
|
ensure_local_buildx_installed
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
def ensure_docker_installed
|
def ensure_local_docker_installed
|
||||||
docker "--version"
|
docker "--version"
|
||||||
end
|
end
|
||||||
|
|
||||||
def ensure_buildx_installed
|
def ensure_local_buildx_installed
|
||||||
docker :buildx, "version"
|
docker :buildx, "version"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user