From 0f752063079644f6a6b676146647e8bc670a7b7c Mon Sep 17 00:00:00 2001 From: Frank John Begornia Date: Fri, 2 Jan 2026 01:41:57 +0800 Subject: [PATCH] Fix deployment: use pre-built image and fix workflow syntax --- .env.example | 10 ++++++---- .gitea/workflows/deploy.yml | 6 +++--- README.md | 4 ++++ docker-compose.yml | 4 +--- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.env.example b/.env.example index 17594e4..076d6df 100644 --- a/.env.example +++ b/.env.example @@ -16,8 +16,10 @@ DB_PASS_MERCHBAY=your_merchbay_password SMTP_HOST=smtp.gmail.com SMTP_PORT=587 -# Crew SMTP (mail@crewsportswear.com) -SMTP_PASS_CREW=your_crew_gmail_app_password +# Crew SMTP Account (mail@crewsportswear.com) +# Gmail App Password for: mail@crewsportswear.com +SMTP_PASS_CREW= -# MerchBay SMTP (support@merchbay.com) -SMTP_PASS_MERCHBAY=your_merchbay_gmail_app_password +# MerchBay SMTP Account (support@merchbay.com) +# Gmail App Password for: support@merchbay.com +SMTP_PASS_MERCHBAY= diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 4c2fb69..7a2bcde 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -146,7 +146,8 @@ jobs: DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} run: | ssh -i ~/.ssh/id_ed25519 $DEPLOY_USER@$DEPLOY_HOST << 'EOF' - echo "Container status:"unified --format "table {{.Names}}\t{{.Status}}\t{{.State}}" + echo "Container status:" + docker ps --filter "name=email_reports_unified" --format "table {{.Names}}\t{{.Status}}\t{{.State}}" echo "" echo "Recent logs:" @@ -163,6 +164,5 @@ jobs: echo "" echo "Filter by brand:" echo " docker exec email_reports_unified grep '[CREW]' /app/email.log" - echo " docker exec email_reports_unified grep '[MERCHBAY]' - echo " docker exec email_reports_crew tail -f /app/email.log" + echo " docker exec email_reports_unified grep '[MERCHBAY]' /app/email.log" EOF diff --git a/README.md b/README.md index 1114ab7..d9a1720 100644 --- a/README.md +++ b/README.md @@ -150,6 +150,7 @@ The unified container handles both brands using the `BRAND` environment variable **Crew Sportswear (`BRAND=crew`)**: - Database: `custom_design` +- SMTP: `mail@crewsportswear.com` - From: `orders@crewsportswear.com` - To: `graphics@crewsportswear.com` - BCC: webmaster, angelo, production @crewsportswear.com @@ -158,12 +159,15 @@ The unified container handles both brands using the `BRAND` environment variable **MerchBay (`BRAND=merchbay`)**: - Database: `merchbay_laravel` +- SMTP: `support@merchbay.com` - From: `orders@merchbay.com` - To: `graphics@crewsportswear.com` - BCC: webmaster, production @crewsportswear.com - Admin: https://merchbay.app - CSV: `daily_order_reports_merchbay/` +**Note**: Each brand uses its own Gmail account for SMTP authentication. + ## Networks Container must be on **crew-app-net** to access MySQL: diff --git a/docker-compose.yml b/docker-compose.yml index f3dd6a8..667be39 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,6 @@ -version: '3.8' - services: email-reports: - build: . + image: email_reports_unified:latest container_name: email_reports_unified restart: unless-stopped environment: