fix: update Docker Compose configuration for service names and database connection
Some checks failed
Build And Publish Production Image / Build And Publish Production Image (push) Failing after 7s

This commit is contained in:
2026-03-28 03:24:00 -03:00
parent 596a17b252
commit 73c51e514c
2 changed files with 20 additions and 14 deletions

View File

@@ -132,7 +132,7 @@ jobs:
echo "Existing stack found with id=${STACK_ID}; sending update request" echo "Existing stack found with id=${STACK_ID}; sending update request"
PAYLOAD=$(jq -n \ PAYLOAD=$(jq -n \
--rawfile stack_file docker-compose.prod.yml \ --rawfile stack_file docker-compose.yml \
'{StackFileContent: $stack_file, Env: [], Prune: false, PullImage: false}') '{StackFileContent: $stack_file, Env: [], Prune: false, PullImage: false}')
APPLY_HTTP_CODE=$(curl -sS -X PUT \ APPLY_HTTP_CODE=$(curl -sS -X PUT \
@@ -150,7 +150,7 @@ jobs:
PAYLOAD=$(jq -n \ PAYLOAD=$(jq -n \
--arg name "${STACK_NAME}" \ --arg name "${STACK_NAME}" \
--rawfile stack_file docker-compose.prod.yml \ --rawfile stack_file docker-compose.yml \
'{Name: $name, StackFileContent: $stack_file, Env: [], FromAppTemplate: false}') '{Name: $name, StackFileContent: $stack_file, Env: [], FromAppTemplate: false}')
APPLY_HTTP_CODE=$(curl -sS -X POST \ APPLY_HTTP_CODE=$(curl -sS -X POST \

View File

@@ -4,14 +4,13 @@ services:
postgres: postgres:
image: postgres:16-alpine image: postgres:16-alpine
restart: unless-stopped restart: unless-stopped
container_name: condado-newsletter-postgres
environment: environment:
POSTGRES_DB: condado POSTGRES_DB: condado
POSTGRES_USER: ${SPRING_DATASOURCE_USERNAME} POSTGRES_USER: ${SPRING_DATASOURCE_USERNAME}
POSTGRES_PASSWORD: ${SPRING_DATASOURCE_PASSWORD} POSTGRES_PASSWORD: ${SPRING_DATASOURCE_PASSWORD}
volumes: volumes:
- postgres-data:/var/lib/postgresql/data - postgres-data:/var/lib/postgresql/data
networks:
- condado-net
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U ${SPRING_DATASOURCE_USERNAME} -d condado"] test: ["CMD-SHELL", "pg_isready -U ${SPRING_DATASOURCE_USERNAME} -d condado"]
interval: 10s interval: 10s
@@ -20,6 +19,7 @@ services:
# ── Backend (Spring Boot) ──────────────────────────────────────────────────── # ── Backend (Spring Boot) ────────────────────────────────────────────────────
backend: backend:
container_name: condado-newsletter-backend
build: build:
context: ./backend context: ./backend
dockerfile: Dockerfile dockerfile: Dockerfile
@@ -29,7 +29,7 @@ services:
condition: service_healthy condition: service_healthy
environment: environment:
SPRING_PROFILES_ACTIVE: dev SPRING_PROFILES_ACTIVE: dev
SPRING_DATASOURCE_URL: ${SPRING_DATASOURCE_URL} SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/condado
SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME} SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME}
SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD} SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD}
APP_PASSWORD: ${APP_PASSWORD} APP_PASSWORD: ${APP_PASSWORD}
@@ -50,36 +50,42 @@ services:
extra_hosts: extra_hosts:
- "celtinha.desktop:host-gateway" - "celtinha.desktop:host-gateway"
- "host.docker.internal:host-gateway" - "host.docker.internal:host-gateway"
networks:
- condado-net
# ── Frontend + Nginx ───────────────────────────────────────────────────────── # ── Frontend + Nginx ─────────────────────────────────────────────────────────
nginx: nginx:
container_name: condado-newsletter-frontend
build: build:
context: ./frontend context: ./frontend
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
VITE_API_BASE_URL: ${VITE_API_BASE_URL} VITE_API_BASE_URL: ${VITE_API_BASE_URL}
restart: unless-stopped restart: unless-stopped
ports:
- "80:80"
depends_on: depends_on:
- backend - backend
networks: networks:
- condado-net - traefik
labels:
- "traefik.enable=true"
- "traefik.http.routers.condado.rule=Host(`condado-newsletter.lab`)"
- "traefik.http.services.condado.loadbalancer.server.port=80"
- "homepage.group=Hyperlink"
- "homepage.name=Condado Newsletter"
- "homepage.description=Automated newsletter generator using AI"
- "homepage.logo=claude-dark.png"
- "homepage.href=http://condado-newsletter.lab"
# ── Mailhog (DEV ONLY — SMTP trap) ─────────────────────────────────────────── # ── Mailhog (DEV ONLY — SMTP trap) ───────────────────────────────────────────
mailhog: mailhog:
container_name: condado-newsletter-mailhog
image: mailhog/mailhog:latest image: mailhog/mailhog:latest
restart: unless-stopped restart: unless-stopped
ports: ports:
- "8025:8025" - "8025:8025"
networks:
- condado-net
volumes: volumes:
postgres-data: postgres-data:
networks: networks:
condado-net: traefik:
driver: bridge external: true
name: traefik