From cd4c7086bf5f1f97a74cfde5216dd24b73be1665 Mon Sep 17 00:00:00 2001
From: Frank John Begornia <frank.begornia@yahoo.com>
Date: Thu, 18 Dec 2025 13:48:54 +0800
Subject: [PATCH] Update environment variables in deployment files for improved
 configuration

---
 .gitea/workflows/deploy-dev.yml |  3 ++-
 .gitea/workflows/deploy.yml     |  3 ++-
 docker-compose.yml              | 16 ++++++++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/deploy-dev.yml b/.gitea/workflows/deploy-dev.yml
index 2242bf7..c46d44d 100644
--- a/.gitea/workflows/deploy-dev.yml
+++ b/.gitea/workflows/deploy-dev.yml
@@ -80,7 +80,8 @@ jobs:
             if [ ! -f .env ]; then
               echo "❌ .env file not found at $DEPLOY_DIR/.env"
               echo "Please create it first with required variables:"
-              echo "  - DB_*, IMAGES_DIRECTORY, PRODUCTION_PRIVATE_SERVER"
+              echo "  - DB_*, PROD_PRIVATE, IMAGES_URL, UPLOAD_URL"
+              echo "  - MAIL_*, CAPTCHA_*, ANALYTICS_*"
               exit 1
             fi
 
diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 859274b..1addd0e 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -51,7 +51,8 @@ jobs:
             cd \$DEPLOY_DIR
             
             # .env file should already exist on server with all required variables
-            # Required: DB_*, IMAGES_DIRECTORY, PRODUCTION_PRIVATE_SERVER
+            # Required: DB_*, PROD_PRIVATE, IMAGES_URL, UPLOAD_URL
+            # Required: MAIL_*, CAPTCHA_*, ANALYTICS_*
             # If it doesn't exist, deployment will fail (this is intentional for security)
             
             docker compose down || true
diff --git a/docker-compose.yml b/docker-compose.yml
index 7f223f9..31eef3d 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,8 +13,20 @@ services:
       - DB_DATABASE=${DB_DATABASE}
       - DB_USERNAME=${DB_USERNAME}
       - DB_PASSWORD=${DB_PASSWORD}
-      - IMAGES_DIRECTORY=${IMAGES_DIRECTORY}
-      - PRODUCTION_PRIVATE_SERVER=${PRODUCTION_PRIVATE_SERVER}
+      - PROD_PRIVATE=${PROD_PRIVATE}
+      - IMAGES_URL=${IMAGES_URL}
+      - UPLOAD_URL=${UPLOAD_URL}
+      - MAIL_DRIVER=${MAIL_DRIVER}
+      - MAIL_HOST=${MAIL_HOST}
+      - MAIL_PORT=${MAIL_PORT}
+      - MAIL_USERNAME=${MAIL_USERNAME}
+      - MAIL_PASSWORD=${MAIL_PASSWORD}
+      - MAIL_ENCRYPTION=${MAIL_ENCRYPTION}
+      - CAPTCHA_SITE_KEY=${CAPTCHA_SITE_KEY}
+      - CAPTCHA_SECRET_KEY=${CAPTCHA_SECRET_KEY}
+      - ANALYTICS_SITE_ID=${ANALYTICS_SITE_ID}
+      - ANALYTICS_CLIENT_ID=${ANALYTICS_CLIENT_ID}
+      - ANALYTICS_SERVICE_EMAIL=${ANALYTICS_SERVICE_EMAIL}
     volumes:
       - ./storage:/var/www/html/storage
       - ./public/uploads:/var/www/html/public/uploads