From b510246eb52aa490753754e24e310bf351af06e6 Mon Sep 17 00:00:00 2001 From: Gabriel Santana de Menezes Date: Wed, 13 May 2026 18:47:25 -0400 Subject: [PATCH] adicionando variaveis faltantes --- .github/workflows/deploy-main.yml | 4 +- deploy/docker-compose.prod.yml | 10 +++- docker-compose.yml | 97 ------------------------------- 3 files changed, 9 insertions(+), 102 deletions(-) delete mode 100644 docker-compose.yml diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml index 0c3993d..32d264e 100644 --- a/.github/workflows/deploy-main.yml +++ b/.github/workflows/deploy-main.yml @@ -137,8 +137,8 @@ jobs: FRONTEND_IMAGE=${FRONTEND_IMAGE} BACKEND_IMAGE=${BACKEND_IMAGE} MP_JWT_VERIFY_ISSUER=${MP_JWT_VERIFY_ISSUER} - SMALLRYE_JWT_SIGN_KEY_LOCATION=${SMALLRYE_JWT_SIGN_KEY_LOCATION} - MP_JWT_VERIFY_PUBLICKEY_LOCATION=${MP_JWT_VERIFY_PUBLICKEY_LOCATION} + SMALLRYE_JWT_SIGN_KEY=${SMALLRYE_JWT_SIGN_KEY} + MP_JWT_VERIFY_PUBLICKEY=${MP_JWT_VERIFY_PUBLICKEY} EOF echo "${GHCR_TOKEN}" | docker login ghcr.io -u "${GHCR_USERNAME}" --password-stdin diff --git a/deploy/docker-compose.prod.yml b/deploy/docker-compose.prod.yml index 0cba900..6948ebe 100644 --- a/deploy/docker-compose.prod.yml +++ b/deploy/docker-compose.prod.yml @@ -1,9 +1,10 @@ services: traefik: - image: traefik:v3.7.1 + image: traefik:v3.6 container_name: bee-task-traefik restart: unless-stopped - + environment: + - DOCKER_API_VERSION=1.54 command: - "--api.insecure=true" - "--providers.docker=true" @@ -81,9 +82,12 @@ services: labels: - "traefik.enable=true" - - "traefik.http.routers.frontend.rule=PathPrefix(`/`)" + - "traefik.http.routers.frontend.rule=PathPrefix(`/frontend`)" - "traefik.http.routers.frontend.entrypoints=web" + - "traefik.http.middlewares.frontend-strip.stripprefix.prefixes=/frontend" + - "traefik.http.routers.frontend.middlewares=frontend-strip" + - "traefik.http.services.frontend.loadbalancer.server.port=3000" networks: diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 0cba900..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,97 +0,0 @@ -services: - traefik: - image: traefik:v3.7.1 - container_name: bee-task-traefik - restart: unless-stopped - - command: - - "--api.insecure=true" - - "--providers.docker=true" - - "--providers.docker.exposedbydefault=false" - - "--entrypoints.web.address=:80" - - "--log.level=DEBUG" - - "--accesslog=true" - - ports: - - "80:80" - - "8080:8080" - - volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro - - networks: - - traefik-public - - postgres: - image: postgres:16 - container_name: bee-task-postgres - restart: unless-stopped - - environment: - POSTGRES_USER: ${POSTGRES_USER} - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} - POSTGRES_DB: ${POSTGRES_DB:-beetask} - - volumes: - - postgres_data:/var/lib/postgresql/data - - healthcheck: - test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"] - interval: 10s - timeout: 5s - retries: 5 - - networks: - - traefik-public - - backend: - image: ${BACKEND_IMAGE} - restart: unless-stopped - - environment: - DB_USER: ${POSTGRES_USER} - DB_PASSWORD: ${POSTGRES_PASSWORD} - DB_URL: ${DB_URL} - MP_JWT_VERIFY_ISSUER: ${MP_JWT_VERIFY_ISSUER} - SMALLRYE_JWT_SIGN_KEY: ${SMALLRYE_JWT_SIGN_KEY} - MP_JWT_VERIFY_PUBLICKEY: ${MP_JWT_VERIFY_PUBLICKEY} - - depends_on: - postgres: - condition: service_healthy - - labels: - - "traefik.enable=true" - - - "traefik.http.routers.backend.rule=PathPrefix(`/backend`)" - - "traefik.http.routers.backend.entrypoints=web" - - - "traefik.http.middlewares.backend-strip.stripprefix.prefixes=/backend" - - "traefik.http.routers.backend.middlewares=backend-strip" - - - "traefik.http.services.backend.loadbalancer.server.port=8081" - - networks: - - traefik-public - - frontend: - image: ${FRONTEND_IMAGE} - restart: unless-stopped - - labels: - - "traefik.enable=true" - - - "traefik.http.routers.frontend.rule=PathPrefix(`/`)" - - "traefik.http.routers.frontend.entrypoints=web" - - - "traefik.http.services.frontend.loadbalancer.server.port=3000" - - networks: - - traefik-public - -volumes: - postgres_data: - -networks: - traefik-public: - driver: bridge