Fix deployment: use pre-built image and fix workflow syntax
Some checks failed
Deploy Production Email Reports (Unified) / deploy (push) Failing after 23s
Some checks failed
Deploy Production Email Reports (Unified) / deploy (push) Failing after 23s
This commit is contained in:
10
.env.example
10
.env.example
@@ -16,8 +16,10 @@ DB_PASS_MERCHBAY=your_merchbay_password
|
|||||||
SMTP_HOST=smtp.gmail.com
|
SMTP_HOST=smtp.gmail.com
|
||||||
SMTP_PORT=587
|
SMTP_PORT=587
|
||||||
|
|
||||||
# Crew SMTP (mail@crewsportswear.com)
|
# Crew SMTP Account (mail@crewsportswear.com)
|
||||||
SMTP_PASS_CREW=your_crew_gmail_app_password
|
# Gmail App Password for: mail@crewsportswear.com
|
||||||
|
SMTP_PASS_CREW=
|
||||||
|
|
||||||
# MerchBay SMTP (support@merchbay.com)
|
# MerchBay SMTP Account (support@merchbay.com)
|
||||||
SMTP_PASS_MERCHBAY=your_merchbay_gmail_app_password
|
# Gmail App Password for: support@merchbay.com
|
||||||
|
SMTP_PASS_MERCHBAY=
|
||||||
|
|||||||
@@ -146,7 +146,8 @@ jobs:
|
|||||||
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
|
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
|
||||||
run: |
|
run: |
|
||||||
ssh -i ~/.ssh/id_ed25519 $DEPLOY_USER@$DEPLOY_HOST << 'EOF'
|
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 ""
|
||||||
echo "Recent logs:"
|
echo "Recent logs:"
|
||||||
@@ -163,6 +164,5 @@ jobs:
|
|||||||
echo ""
|
echo ""
|
||||||
echo "Filter by brand:"
|
echo "Filter by brand:"
|
||||||
echo " docker exec email_reports_unified grep '[CREW]' /app/email.log"
|
echo " docker exec email_reports_unified grep '[CREW]' /app/email.log"
|
||||||
echo " docker exec email_reports_unified grep '[MERCHBAY]'
|
echo " docker exec email_reports_unified grep '[MERCHBAY]' /app/email.log"
|
||||||
echo " docker exec email_reports_crew tail -f /app/email.log"
|
|
||||||
EOF
|
EOF
|
||||||
|
|||||||
@@ -150,6 +150,7 @@ The unified container handles both brands using the `BRAND` environment variable
|
|||||||
|
|
||||||
**Crew Sportswear (`BRAND=crew`)**:
|
**Crew Sportswear (`BRAND=crew`)**:
|
||||||
- Database: `custom_design`
|
- Database: `custom_design`
|
||||||
|
- SMTP: `mail@crewsportswear.com`
|
||||||
- From: `orders@crewsportswear.com`
|
- From: `orders@crewsportswear.com`
|
||||||
- To: `graphics@crewsportswear.com`
|
- To: `graphics@crewsportswear.com`
|
||||||
- BCC: webmaster, angelo, production @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`)**:
|
**MerchBay (`BRAND=merchbay`)**:
|
||||||
- Database: `merchbay_laravel`
|
- Database: `merchbay_laravel`
|
||||||
|
- SMTP: `support@merchbay.com`
|
||||||
- From: `orders@merchbay.com`
|
- From: `orders@merchbay.com`
|
||||||
- To: `graphics@crewsportswear.com`
|
- To: `graphics@crewsportswear.com`
|
||||||
- BCC: webmaster, production @crewsportswear.com
|
- BCC: webmaster, production @crewsportswear.com
|
||||||
- Admin: https://merchbay.app
|
- Admin: https://merchbay.app
|
||||||
- CSV: `daily_order_reports_merchbay/`
|
- CSV: `daily_order_reports_merchbay/`
|
||||||
|
|
||||||
|
**Note**: Each brand uses its own Gmail account for SMTP authentication.
|
||||||
|
|
||||||
## Networks
|
## Networks
|
||||||
|
|
||||||
Container must be on **crew-app-net** to access MySQL:
|
Container must be on **crew-app-net** to access MySQL:
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
version: '3.8'
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
email-reports:
|
email-reports:
|
||||||
build: .
|
image: email_reports_unified:latest
|
||||||
container_name: email_reports_unified
|
container_name: email_reports_unified
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
|
|||||||
Reference in New Issue
Block a user