From b067be2ff71cce9b8eeb4c8d2ba37df012916dc8 Mon Sep 17 00:00:00 2001 From: sepehr Date: Sun, 31 May 2026 21:51:38 +0200 Subject: [PATCH] fix: deploy.sh auto-selects compose file, docker-compose.yml uses correct Stripe var names --- deploy.sh | 7 ++++++- docker-compose.yml | 12 ++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/deploy.sh b/deploy.sh index 637b201..759879b 100755 --- a/deploy.sh +++ b/deploy.sh @@ -52,7 +52,12 @@ cd "$SCRIPT_DIR" COMPOSE_LOCAL="docker-compose.local.yml" COMPOSE_PROD="docker-compose.yml" ENV_FILE=".env.docker" -COMPOSE_FILE="$COMPOSE_LOCAL" +# Default to production compose if local compose doesn't exist (server context) +if [ -f "$COMPOSE_LOCAL" ] && [ -f ".env.docker" ]; then + COMPOSE_FILE="$COMPOSE_LOCAL" +else + COMPOSE_FILE="$COMPOSE_PROD" +fi COMMAND="" SERVICE="" NO_BUILD=false diff --git a/docker-compose.yml b/docker-compose.yml index ef38819..8af1dfb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -100,12 +100,16 @@ services: - ADMIN_TOKEN_SECRET=${ADMIN_TOKEN_SECRET} - CORS_ORIGINS=${CORS_ORIGINS:-https://wordly.art} - STRIPE_SECRET_KEY=${STRIPE_SECRET_KEY:-} + - STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY:-} - STRIPE_WEBHOOK_SECRET=${STRIPE_WEBHOOK_SECRET:-} - - STRIPE_STARTER_PRICE_ID=${STRIPE_STARTER_PRICE_ID:-} - - STRIPE_PRO_PRICE_ID=${STRIPE_PRO_PRICE_ID:-} - - STRIPE_BUSINESS_PRICE_ID=${STRIPE_BUSINESS_PRICE_ID:-} + - STRIPE_PRICE_STARTER_MONTHLY=${STRIPE_PRICE_STARTER_MONTHLY:-} + - STRIPE_PRICE_STARTER_YEARLY=${STRIPE_PRICE_STARTER_YEARLY:-} + - STRIPE_PRICE_PRO_MONTHLY=${STRIPE_PRICE_PRO_MONTHLY:-} + - STRIPE_PRICE_PRO_YEARLY=${STRIPE_PRICE_PRO_YEARLY:-} + - STRIPE_PRICE_BUSINESS_MONTHLY=${STRIPE_PRICE_BUSINESS_MONTHLY:-} + - STRIPE_PRICE_BUSINESS_YEARLY=${STRIPE_PRICE_BUSINESS_YEARLY:-} + - FRONTEND_URL=${FRONTEND_URL:-https://wordly.art} - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID:-} - - GOOGLE_CLOUD_API_KEY=${GOOGLE_CLOUD_API_KEY:-} volumes: - uploads_data:/app/uploads - outputs_data:/app/outputs