From 7631f09aa645373ec83ee25d7a58c099debdf522 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Fri, 25 Sep 2020 20:19:10 +0200 Subject: [PATCH] Re-work DOCKER_HOST usage --- plugin.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugin.sh b/plugin.sh index 0986386..8ba0493 100755 --- a/plugin.sh +++ b/plugin.sh @@ -8,7 +8,7 @@ PLUGIN_PORT=${PLUGIN_PORT:-222} PLUGIN_PURGE=${PLUGIN_PURGE:-"false"} PLUGIN_USER=${PLUGIN_USER:-drone} -export DOCKER_HOST="ssh://$PLUGIN_USER@$PLUGIN_HOST:$PLUGIN_PORT" +DOCKER_HOST="ssh://$PLUGIN_USER@$PLUGIN_HOST:$PLUGIN_PORT" generate_secrets() { echo "--- start secrets ---" @@ -44,11 +44,13 @@ output_versions(){ run_stack_deploy() { echo "--- start deploy ---" - docker stack deploy -c "$PLUGIN_COMPOSE" "$PLUGIN_STACK" + docker -H "$DOCKER_HOST" stack deploy -c "$PLUGIN_COMPOSE" "$PLUGIN_STACK" echo "--- end deploy ---" } run_stack_wait() { + export DOCKER_HOST="ssh://$PLUGIN_USER@$PLUGIN_HOST:$PLUGIN_PORT" + docker run --rm vitalets/docker-stack-wait-deploy \ | sed 's/True/true/' \ | bash /dev/stdin "$PLUGIN_STACK" @@ -56,7 +58,7 @@ run_stack_wait() { run_purge() { echo "--- start purge ---" - docker prune --all --volumes --force + docker -H "$DOCKER_HOST" prune --all --volumes --force echo "--- end purge ---" }