From 586f2a8750fd3089dc69393a2f55328e42a711ae Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 23 Oct 2020 00:25:27 +0100 Subject: [PATCH] . --- .drone/deploy.sh | 1 + .drone/scripts/initialise-image.sh | 15 --------------- .drone/scripts/initialise-images.sh | 4 ---- .drone/scripts/login.sh | 13 ------------- 4 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 .drone/scripts/initialise-image.sh delete mode 100644 .drone/scripts/initialise-images.sh delete mode 100644 .drone/scripts/login.sh diff --git a/.drone/deploy.sh b/.drone/deploy.sh index 385fcdd..d04ecdf 100644 --- a/.drone/deploy.sh +++ b/.drone/deploy.sh @@ -1,4 +1,5 @@ export LOCAL_DOCKER_REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/ \ +&& echo $LOCAL_DOCKER_REGISTRY \ && docker stack rm guacamole \ && echo 'sleeping...zzz' \ && sleep 60 \ diff --git a/.drone/scripts/initialise-image.sh b/.drone/scripts/initialise-image.sh deleted file mode 100644 index 5692e04..0000000 --- a/.drone/scripts/initialise-image.sh +++ /dev/null @@ -1,15 +0,0 @@ -n=0 -while : -do - docker pull $2 \ - && docker tag $2 $1$2 \ - && docker push $1$2 && break # substitute your command here - n=$((n+1)) - if [ $n -ge 10 ]; then - echo "initialise failed" - exit 1 - fi - echo "retrying..$n" - sleep 5 -done - diff --git a/.drone/scripts/initialise-images.sh b/.drone/scripts/initialise-images.sh deleted file mode 100644 index 5b7fc9b..0000000 --- a/.drone/scripts/initialise-images.sh +++ /dev/null @@ -1,4 +0,0 @@ -sh $(dirname $0)/login.sh $1 "$2" \ -&& sh $(dirname $0)/initialise-image.sh $1 postgres:12.4 \ -&& sh $(dirname $0)/initialise-image.sh $1 guacamole/guacd:1.2.0 \ -&& sh $(dirname $0)/initialise-image.sh $1 guacamole/guacamole:1.2.0 diff --git a/.drone/scripts/login.sh b/.drone/scripts/login.sh deleted file mode 100644 index cc1af90..0000000 --- a/.drone/scripts/login.sh +++ /dev/null @@ -1,13 +0,0 @@ -n=0 -while : -do - docker login $1 --username client --password "$2" \ - && break # substitute your command here - n=$((n+1)) - if [ $n -ge 10 ]; then - echo "login failed" - exit 1 - fi - echo "retrying login..$n" - sleep 5 -done