From 100d68d67e6e773f51efcb15e884e763966c0ffd Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Fri, 13 Jan 2023 17:11:01 +0100 Subject: [PATCH] Only install docker if missing --- lib/tasks/mrsk/mrsk.rake | 2 +- lib/tasks/mrsk/server.rake | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/tasks/mrsk/mrsk.rake b/lib/tasks/mrsk/mrsk.rake index e66b13a3..7df4252d 100644 --- a/lib/tasks/mrsk/mrsk.rake +++ b/lib/tasks/mrsk/mrsk.rake @@ -2,7 +2,7 @@ require_relative "setup" namespace :mrsk do desc "Deploy app for the first time to a fresh server" - task fresh: %w[ server:bootstrap registry:login build:deliver traefik:run app:stop app:run ] + task fresh: %w[ server:bootstrap deploy ] desc "Push the latest version of the app, ensure Traefik is running, then restart app" task deploy: %w[ registry:login build:deliver traefik:run app:stop app:run prune ] diff --git a/lib/tasks/mrsk/server.rake b/lib/tasks/mrsk/server.rake index 07620631..68747b0d 100644 --- a/lib/tasks/mrsk/server.rake +++ b/lib/tasks/mrsk/server.rake @@ -4,8 +4,7 @@ namespace :mrsk do namespace :server do desc "Setup Docker on the remote servers" task :bootstrap do - # FIXME: Detect when apt-get is not available and use the appropriate alternative - on(MRSK.config.hosts) { execute "apt-get install docker.io -y" } + on(MRSK.config.hosts) { execute "which docker || apt-get install docker.io -y" } end end end