From 8f47867ba642658f9c7292ebbc954d8476bcc3cb Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Thu, 24 Sep 2020 16:06:15 +0100 Subject: [PATCH] fix:minor --- .drone/deploy.sh | 8 ++++---- .drone/scripts/login.sh | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.drone/deploy.sh b/.drone/deploy.sh index 6d287e0..bddd21e 100644 --- a/.drone/deploy.sh +++ b/.drone/deploy.sh @@ -1,4 +1,4 @@ -docker stack rm drone -echo 'sleeping...zzz' -sleep 60 -docker stack deploy -c docker-compose.yml drone +docker stack rm drone \ +&& echo 'sleeping...zzz' \ +&& sleep 60 \ +&& docker stack deploy -c docker-compose.yml drone diff --git a/.drone/scripts/login.sh b/.drone/scripts/login.sh index 771c6e2..8f7c85e 100644 --- a/.drone/scripts/login.sh +++ b/.drone/scripts/login.sh @@ -12,6 +12,3 @@ do echo "retrying login..$n" sleep 5 done - -sh $(dirname $0)/initialise-image.sh $1 drone/drone:1.9.0 \ -&& sh $(dirname $0)/initialise-image.sh $1 drone/drone-runner-docker:1.5.0 \ No newline at end of file