From 91f6cba3e942e09d62826c925339343221e5aebb Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 20 Jan 2023 22:47:48 -0800 Subject: [PATCH] Handle multiple compose files --- plugin.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugin.sh b/plugin.sh index b0bc5a3..0586d6b 100755 --- a/plugin.sh +++ b/plugin.sh @@ -64,15 +64,14 @@ output_versions(){ run_stack_deploy() { echo "--- start deploy ---" - if [[ ! -z "${PLUGIN_REG_USER}" ]] && [[ ! -z "${PLUGIN_REG_PASS}" ]]; then + if [[ -n "${PLUGIN_REG_USER}" ]] && [[ -n "${PLUGIN_REG_PASS}" ]]; then echo "--- discovered secrets, assuming private registry, logging in ---" docker -H "$REMOTE_DOCKER_HOST" login -u "${PLUGIN_REG_USER}" -p "${PLUGIN_REG_PASS}" docker -H "$REMOTE_DOCKER_HOST" pull "${PLUGIN_IMAGE}" echo "${PLUGIN_IMAGE}" - docker -H "$REMOTE_DOCKER_HOST" stack deploy -c "$PLUGIN_COMPOSE" "$PLUGIN_STACK" - else - docker -H "$REMOTE_DOCKER_HOST" stack deploy -c "$PLUGIN_COMPOSE" "$PLUGIN_STACK" fi + # shellcheck disable=SC2086 + docker -H "$REMOTE_DOCKER_HOST" stack deploy -c ${PLUGIN_COMPOSE//:/ -c } "$PLUGIN_STACK" echo "--- end deploy ---" }