diff --git a/.scripts/deploy.sh b/.scripts/deploy.sh index a099692..5973910 100755 --- a/.scripts/deploy.sh +++ b/.scripts/deploy.sh @@ -7,11 +7,11 @@ set -euo pipefail -SSH_CMD="ssh -i ~/.ssh/cloud_servers_rsa root@akamai" +SSH_CMD="ssh akamai" REMOTE_DIR="/root/container-data/major-domo" SERVICE="discord-app" CONTAINER="major-domo-discord-app-1" -IMAGE="manticorum67/major-domo-discordapp:latest" +IMAGE="manticorum67/major-domo-discordapp:production" SKIP_CONFIRM=false [[ "${1:-}" == "-y" ]] && SKIP_CONFIRM=true @@ -19,9 +19,9 @@ SKIP_CONFIRM=false # --- Pre-deploy checks --- if [[ -n "$(git status --porcelain 2>/dev/null)" ]]; then - echo "WARNING: You have uncommitted changes." - git status --short - echo "" + echo "WARNING: You have uncommitted changes." + git status --short + echo "" fi BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "unknown") @@ -32,9 +32,12 @@ echo "Target: akamai (${IMAGE})" echo "" if [[ "$SKIP_CONFIRM" != true ]]; then - read -rp "Deploy to production? [y/N] " answer - [[ "$answer" =~ ^[Yy]$ ]] || { echo "Aborted."; exit 0; } - echo "" + read -rp "Deploy to production? [y/N] " answer + [[ "$answer" =~ ^[Yy]$ ]] || { + echo "Aborted." + exit 0 + } + echo "" fi # --- Save previous image for rollback --- @@ -64,16 +67,16 @@ echo "" echo "==> Image digest: ${NEW_DIGEST}" if [[ "$PREV_DIGEST" == "$NEW_DIGEST" ]]; then - echo " (unchanged from previous deploy)" + echo " (unchanged from previous deploy)" fi # --- Rollback command --- if [[ "$PREV_DIGEST" != "unknown" && "$PREV_DIGEST" != "$NEW_DIGEST" ]]; then - echo "" - echo "==> To rollback:" - echo " ssh -i ~/.ssh/cloud_servers_rsa root@akamai \\" - echo " \"cd ${REMOTE_DIR} && docker pull ${PREV_DIGEST} && docker tag ${PREV_DIGEST} ${IMAGE} && docker compose up -d ${SERVICE}\"" + echo "" + echo "==> To rollback:" + echo " ssh akamai \\" + echo " \"cd ${REMOTE_DIR} && docker pull ${PREV_DIGEST} && docker tag ${PREV_DIGEST} ${IMAGE} && docker compose up -d ${SERVICE}\"" fi echo ""