From 42056e14630a76b0af53213a669cf9460a93435a Mon Sep 17 00:00:00 2001 From: Wayne Connolly Date: Sun, 1 Jul 2018 10:39:32 +1000 Subject: [PATCH] Corrected vars --- script.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/script.sh b/script.sh index d8f6327..e1bae90 100644 --- a/script.sh +++ b/script.sh @@ -1,14 +1,16 @@ #!/bin/sh RANCHER_COMPOSE=`find / -name rancher-compose.yml` DOCKER_COMPOSE=`find / -name docker-compose.yml` -echo "rancher-compose.yml @ ${RANCHER_COMPOSE}\n" +echo "rancher-compose.yml @ ${RANCHER_COMPOSE}" cat ${RANCHER_COMPOSE} -echo "\n\ndocker-compose.yml @ ${DOCKER_COMPOSE}\n" +echo "" +echo "docker-compose.yml @ ${DOCKER_COMPOSE}" cat ${DOCKER_COMPOSE} -echo "\n\nDeploying Rancher Stack with force upgrade\n\n" +echo "" +echo "Deploying Rancher Stack with force upgrade" /bin/rancher-compose \ --url http://${PLUGIN_URL}/v1 \ --access-key ${PLUGIN_ACCESSKEY} \ --secret-key ${PLUGIN_SECRETKEY} \ - -f rancher/${PLUGIN_PATH}/docker-compose.yml -r rancher/${PLUGIN_PATH}/rancher-compose.yml \ + -f ${DOCKER_COMPOSE} -r ${RANCHER_COMPOSE} \ --verbose -p ${PLUGIN_STACK} up -p -d --force-upgrade --confirm-upgrade