From 9f305d3e7841734e6bda9d74d48f019c0c43db33 Mon Sep 17 00:00:00 2001 From: denshooter Date: Wed, 15 Oct 2025 15:39:00 +0200 Subject: [PATCH] Fix environment variables in deployment scripts - Export all environment variables before deployment to ensure they're available to child processes - Add logging to show which variables are configured (without revealing secrets) - This fixes docker-compose warnings about missing environment variables - Ensures both docker run and docker-compose scenarios work correctly Updated scripts: - scripts/gitea-deploy.sh - scripts/gitea-deploy-simple.sh --- scripts/gitea-deploy-simple.sh | 24 ++++++++++++++++++++++++ scripts/gitea-deploy.sh | 24 ++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/scripts/gitea-deploy-simple.sh b/scripts/gitea-deploy-simple.sh index f160bdb..f1fd424 100755 --- a/scripts/gitea-deploy-simple.sh +++ b/scripts/gitea-deploy-simple.sh @@ -88,6 +88,30 @@ success "✅ Docker image built successfully" # Step 3: Deployment log "🚀 Step 3: Deploying application..." +# Export environment variables for docker-compose compatibility +log "📝 Exporting environment variables..." +export NODE_ENV=${NODE_ENV:-production} +export NEXT_PUBLIC_BASE_URL=${NEXT_PUBLIC_BASE_URL:-https://dk0.dev} +export MY_EMAIL=${MY_EMAIL:-contact@dk0.dev} +export MY_INFO_EMAIL=${MY_INFO_EMAIL:-info@dk0.dev} +export MY_PASSWORD="${MY_PASSWORD}" +export MY_INFO_PASSWORD="${MY_INFO_PASSWORD}" +export ADMIN_BASIC_AUTH="${ADMIN_BASIC_AUTH}" +export LOG_LEVEL=${LOG_LEVEL:-info} +export PORT=${PORT:-3000} + +# Log which variables are set (without revealing secrets) +log "Environment variables configured:" +log " - NODE_ENV: ${NODE_ENV}" +log " - NEXT_PUBLIC_BASE_URL: ${NEXT_PUBLIC_BASE_URL}" +log " - MY_EMAIL: ${MY_EMAIL}" +log " - MY_INFO_EMAIL: ${MY_INFO_EMAIL}" +log " - MY_PASSWORD: [SET]" +log " - MY_INFO_PASSWORD: [SET]" +log " - ADMIN_BASIC_AUTH: [SET]" +log " - LOG_LEVEL: ${LOG_LEVEL}" +log " - PORT: ${PORT}" + # Check if container is running if [ "$(docker inspect -f '{{.State.Running}}' "$CONTAINER_NAME" 2>/dev/null)" = "true" ]; then log "📦 Stopping existing container..." diff --git a/scripts/gitea-deploy.sh b/scripts/gitea-deploy.sh index 9aac747..baa24c9 100755 --- a/scripts/gitea-deploy.sh +++ b/scripts/gitea-deploy.sh @@ -107,6 +107,30 @@ success "✅ Docker image built successfully" # Step 4: Deployment log "🚀 Step 4: Deploying application..." +# Export environment variables for docker-compose compatibility +log "📝 Exporting environment variables..." +export NODE_ENV=${NODE_ENV:-production} +export NEXT_PUBLIC_BASE_URL=${NEXT_PUBLIC_BASE_URL:-https://dk0.dev} +export MY_EMAIL=${MY_EMAIL:-contact@dk0.dev} +export MY_INFO_EMAIL=${MY_INFO_EMAIL:-info@dk0.dev} +export MY_PASSWORD="${MY_PASSWORD}" +export MY_INFO_PASSWORD="${MY_INFO_PASSWORD}" +export ADMIN_BASIC_AUTH="${ADMIN_BASIC_AUTH}" +export LOG_LEVEL=${LOG_LEVEL:-info} +export PORT=${PORT:-3000} + +# Log which variables are set (without revealing secrets) +log "Environment variables configured:" +log " - NODE_ENV: ${NODE_ENV}" +log " - NEXT_PUBLIC_BASE_URL: ${NEXT_PUBLIC_BASE_URL}" +log " - MY_EMAIL: ${MY_EMAIL}" +log " - MY_INFO_EMAIL: ${MY_INFO_EMAIL}" +log " - MY_PASSWORD: [SET]" +log " - MY_INFO_PASSWORD: [SET]" +log " - ADMIN_BASIC_AUTH: [SET]" +log " - LOG_LEVEL: ${LOG_LEVEL}" +log " - PORT: ${PORT}" + # Check if container is running if [ "$(docker inspect -f '{{.State.Running}}' "$CONTAINER_NAME" 2>/dev/null)" = "true" ]; then log "📦 Stopping existing container..."