Fix GitHub Actions to create :main tag for easier deployment

- Added type=raw,value=main to both API and Nginx image metadata
- This will create both SHA tags and :main tags for the default branch
- Fixes deployment timeout issues when pulling from GHCR
- Also added temporary deployment file using specific SHA
This commit is contained in:
dlawler489 2026-05-05 15:14:02 +10:00
parent 99068d6710
commit 9dee4b32a1
2 changed files with 91 additions and 0 deletions

View file

@ -53,6 +53,7 @@ jobs:
type=semver,pattern={{version}} type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}}.{{minor}}
type=sha,prefix=sha- type=sha,prefix=sha-
type=raw,value=main,enable={{is_default_branch}}
- name: Build React client - name: Build React client
working-directory: ./client working-directory: ./client
@ -95,6 +96,7 @@ jobs:
type=semver,pattern={{version}} type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}}.{{minor}}
type=sha,prefix=sha- type=sha,prefix=sha-
type=raw,value=main,enable={{is_default_branch}}
- name: Build and push Nginx image - name: Build and push Nginx image
uses: docker/build-push-action@v5 uses: docker/build-push-action@v5

View file

@ -0,0 +1,89 @@
services:
# Nginx reverse proxy and static file server (client baked into image)
nginx:
image: ghcr.io/dlawler489/etsy-finance-tracker-nginx:sha-99068d6
container_name: etsy-nginx
ports:
- "3000:80"
depends_on:
- etsy-tracker
restart: unless-stopped
labels:
- "traefik.enable=true"
- "traefik.docker.network=traefik_default"
- "traefik.http.routers.etsy.rule=Host(`etsy.plexultra.com`)"
- "traefik.http.routers.etsy.entrypoints=websecure"
- "traefik.http.routers.etsy.tls.certresolver=le"
- "traefik.http.services.etsy.loadbalancer.server.port=80"
networks:
- etsy-network
- traefik_default
healthcheck:
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost/"]
interval: 30s
timeout: 10s
retries: 3
start_period: 10s
# Etsy Finance Tracker API Server (from GitHub Container Registry)
etsy-tracker:
image: ghcr.io/dlawler489/etsy-finance-tracker:sha-99068d6
container_name: etsy-finance-tracker
expose:
- "8080"
environment:
- NODE_ENV=production
- PORT=8080
- CLIENT_URL=http://nginx
- MONGODB_URI=mongodb://mongodb:27017/etsy-tracker
- JWT_SECRET=${JWT_SECRET:-changeme}
volumes:
- etsy_data:/app/data
- etsy_uploads:/app/uploads
depends_on:
- mongodb
restart: unless-stopped
networks:
- etsy-network
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
interval: 30s
timeout: 10s
retries: 3
start_period: 40s
# MongoDB database
mongodb:
image: mongo:7
container_name: etsy-mongodb
environment:
MONGO_INITDB_DATABASE: etsy-tracker
volumes:
- mongodb_data:/data/db
- mongodb_config:/data/configdb
restart: unless-stopped
networks:
- etsy-network
healthcheck:
test: ["CMD", "mongosh", "--eval", "db.adminCommand('ping')"]
interval: 30s
timeout: 10s
retries: 3
start_period: 40s
# External network for Traefik (must be created manually)
networks:
etsy-network:
driver: bridge
traefik_default:
external: true
volumes:
mongodb_data:
driver: local
mongodb_config:
driver: local
etsy_data:
driver: local
etsy_uploads:
driver: local