From 3e38ce2fad0088b50f98d33bfec567d3d7ce637d Mon Sep 17 00:00:00 2001 From: Rodolfo Berrios <20590102+rodber@users.noreply.github.com> Date: Fri, 16 Feb 2024 16:48:00 -0300 Subject: [PATCH] fix feedback --- Makefile | 20 +++++++++----------- scripts/system/deploy.sh | 8 +++++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 0f99854..73a7cf6 100644 --- a/Makefile +++ b/Makefile @@ -189,39 +189,37 @@ setup: cron proxy # Docker compose -up: feedback feedback--compose feedback--url +up: feedback--compose feedback--url ${DOCKER_COMPOSE} up -up-d: feedback feedback--compose feedback--url +up-d: feedback--compose feedback--url ${DOCKER_COMPOSE} up -d -stop: feedback feedback--compose +stop: feedback--compose ${DOCKER_COMPOSE} stop -start: feedback feedback--compose +start: feedback--compose ${DOCKER_COMPOSE} start -restart: feedback feedback--compose +restart: feedback--compose ${DOCKER_COMPOSE} restart -down: feedback feedback--compose +down: feedback--compose ${DOCKER_COMPOSE} down -down--volumes: feedback feedback--compose +down--volumes: feedback--compose ${DOCKER_COMPOSE} down --volumes # Instances -spawn: feedback feedback--compose feedback--url cloudflare--create up-d - .PHONY: deploy deploy: @./scripts/system/deploy.sh -update: feedback feedback--compose feedback--url +update: feedback--compose feedback--url @./scripts/system/update.sh -destroy: feedback feedback--compose cloudflare--delete +destroy: feedback--compose cloudflare--delete ${DOCKER_COMPOSE} down --volumes @rm namespace/${NAMESPACE} diff --git a/scripts/system/deploy.sh b/scripts/system/deploy.sh index 7d4b6dc..b4a6143 100755 --- a/scripts/system/deploy.sh +++ b/scripts/system/deploy.sh @@ -18,17 +18,19 @@ if [ -z ${CLOUDFLARE_A_NAME} ]; then else HOSTNAME="${NAMESPACE}.${DOMAIN}" fi +make --no-print-directory feedback echo "* Using hostname ${HOSTNAME}" -make --no-print-directory feedback feedback--compose feedback--url NAMESPACE=${NAMESPACE} +make --no-print-directory feedback--compose feedback--url NAMESPACE=${NAMESPACE} make --no-print-directory namespace NAMESPACE=${NAMESPACE} HOSTNAME="${HOSTNAME}" if [ -n "${CLOUDFLARE_A_NAME}" ]; then make --no-print-directory cloudflare--create NAMESPACE=${NAMESPACE} fi make --no-print-directory up-d NAMESPACE=${NAMESPACE} make --no-print-directory install NAMESPACE=${NAMESPACE} ADMIN_USER=${ADMIN_USER} ADMIN_EMAIL=${ADMIN_EMAIL} ADMIN_PASSWORD=${ADMIN_PASSWORD} -echo "" echo "[OK] Deployment complete!" cat <