fix: deploy.sh auto-selects compose file, docker-compose.yml uses correct Stripe var names
Some checks failed
Deploy to Production / Build and Deploy (push) Failing after 1m16s

This commit is contained in:
2026-05-31 21:51:38 +02:00
parent c7c1fd8436
commit b067be2ff7
2 changed files with 14 additions and 5 deletions

View File

@@ -52,7 +52,12 @@ cd "$SCRIPT_DIR"
COMPOSE_LOCAL="docker-compose.local.yml" COMPOSE_LOCAL="docker-compose.local.yml"
COMPOSE_PROD="docker-compose.yml" COMPOSE_PROD="docker-compose.yml"
ENV_FILE=".env.docker" ENV_FILE=".env.docker"
# Default to production compose if local compose doesn't exist (server context)
if [ -f "$COMPOSE_LOCAL" ] && [ -f ".env.docker" ]; then
COMPOSE_FILE="$COMPOSE_LOCAL" COMPOSE_FILE="$COMPOSE_LOCAL"
else
COMPOSE_FILE="$COMPOSE_PROD"
fi
COMMAND="" COMMAND=""
SERVICE="" SERVICE=""
NO_BUILD=false NO_BUILD=false

View File

@@ -100,12 +100,16 @@ services:
- ADMIN_TOKEN_SECRET=${ADMIN_TOKEN_SECRET} - ADMIN_TOKEN_SECRET=${ADMIN_TOKEN_SECRET}
- CORS_ORIGINS=${CORS_ORIGINS:-https://wordly.art} - CORS_ORIGINS=${CORS_ORIGINS:-https://wordly.art}
- STRIPE_SECRET_KEY=${STRIPE_SECRET_KEY:-} - STRIPE_SECRET_KEY=${STRIPE_SECRET_KEY:-}
- STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY:-}
- STRIPE_WEBHOOK_SECRET=${STRIPE_WEBHOOK_SECRET:-} - STRIPE_WEBHOOK_SECRET=${STRIPE_WEBHOOK_SECRET:-}
- STRIPE_STARTER_PRICE_ID=${STRIPE_STARTER_PRICE_ID:-} - STRIPE_PRICE_STARTER_MONTHLY=${STRIPE_PRICE_STARTER_MONTHLY:-}
- STRIPE_PRO_PRICE_ID=${STRIPE_PRO_PRICE_ID:-} - STRIPE_PRICE_STARTER_YEARLY=${STRIPE_PRICE_STARTER_YEARLY:-}
- STRIPE_BUSINESS_PRICE_ID=${STRIPE_BUSINESS_PRICE_ID:-} - 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_CLIENT_ID=${GOOGLE_CLIENT_ID:-}
- GOOGLE_CLOUD_API_KEY=${GOOGLE_CLOUD_API_KEY:-}
volumes: volumes:
- uploads_data:/app/uploads - uploads_data:/app/uploads
- outputs_data:/app/outputs - outputs_data:/app/outputs