blaisadmin/Arsenal_IQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updating compose

Browse Source
This commit is contained in:
blaisadmin
2026-03-26 11:14:53 -04:00
parent 266e45f16f
commit 96d9e3ebd5
2 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-compose.prod.yml
+22 -11
View File
@@ -15,7 +15,7 @@ services:
timeout: 5s timeout: 5s
retries: 10 retries: 10
networks: networks:
- app - arsenal_iq
backend: backend:
build: build:
@@ -25,8 +25,17 @@ services:
environment: environment:
PORT: 5000 PORT: 5000
NODE_ENV: ${NODE_ENV:-production} NODE_ENV: ${NODE_ENV:-production}
DATABASE_URL: postgresql://${POSTGRES_USER:-arsenal}:${POSTGRES_PASSWORD:-arsenal_dev_password}@postgres:5432/${POSTGRES_DB:-arsenal_iq} POSTGRES_HOST: postgres
POSTGRES_PORT: 5432
POSTGRES_DB: ${POSTGRES_DB:-arsenal_iq}
POSTGRES_USER: ${POSTGRES_USER:-arsenal}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-arsenal_dev_password}
FRONTEND_URL: ${FRONTEND_URL:-https://arsenal.example.com} FRONTEND_URL: ${FRONTEND_URL:-https://arsenal.example.com}
ALLOW_REGISTRATION: ${ALLOW_REGISTRATION:-true}
ALLOW_DEMO_ACCOUNT: ${ALLOW_DEMO_ACCOUNT:-false}
DEMO_ACCOUNT_EMAIL: ${DEMO_ACCOUNT_EMAIL:-demo@arsenaliq.local}
DEMO_ACCOUNT_PASSWORD: ${DEMO_ACCOUNT_PASSWORD:-demo1234}
DEMO_ACCOUNT_NAME: ${DEMO_ACCOUNT_NAME:-Demo User}
depends_on: depends_on:
postgres: postgres:
condition: service_healthy condition: service_healthy
@@ -38,14 +47,14 @@ services:
- ./backend/node_modules:/app/node_modules - ./backend/node_modules:/app/node_modules
labels: labels:
- traefik.enable=true - traefik.enable=true
- traefik.docker.network=${TRAEFIK_NETWORK:-traefik_proxy} - traefik.docker.network=${TRAEFIK_NETWORK:-traefik}
- traefik.http.routers.arsenaliq-api.rule=Host(`${TRAEFIK_API_HOST:-api.arsenal.local}`) - traefik.http.routers.arsenaliq-api.rule=Host(`${TRAEFIK_API_HOST:-api.arsenal.local}`)
- traefik.http.routers.arsenaliq-api.entrypoints=${TRAEFIK_ENTRYPOINT:-websecure} - traefik.http.routers.arsenaliq-api.entrypoints=${TRAEFIK_ENTRYPOINT:-websecure}
- traefik.http.routers.arsenaliq-api.tls=true - traefik.http.routers.arsenaliq-api.tls=true
- traefik.http.services.arsenaliq-api.loadbalancer.server.port=5000 - traefik.http.services.arsenaliq-api.loadbalancer.server.port=5000
networks: networks:
- app - arsenal_iq
- traefik_proxy - traefik
frontend: frontend:
build: build:
@@ -54,6 +63,8 @@ services:
container_name: arsenaliq-frontend container_name: arsenaliq-frontend
environment: environment:
VITE_API_BASE_URL: ${VITE_API_BASE_URL:-https://api.arsenal.example.com/api} VITE_API_BASE_URL: ${VITE_API_BASE_URL:-https://api.arsenal.example.com/api}
VITE_ALLOW_REGISTRATION: ${ALLOW_REGISTRATION:-true}
VITE_ALLOW_DEMO_ACCOUNT: ${ALLOW_DEMO_ACCOUNT:-false}
depends_on: depends_on:
- backend - backend
command: > command: >
@@ -64,18 +75,18 @@ services:
- ./frontend/node_modules:/app/node_modules - ./frontend/node_modules:/app/node_modules
labels: labels:
- traefik.enable=true - traefik.enable=true
- traefik.docker.network=${TRAEFIK_NETWORK:-traefik_proxy} - traefik.docker.network=${TRAEFIK_NETWORK:-traefik}
- traefik.http.routers.arsenaliq-web.rule=Host(`${TRAEFIK_WEB_HOST:-arsenal.local}`) - traefik.http.routers.arsenaliq-web.rule=Host(`${TRAEFIK_WEB_HOST:-arsenal.local}`)
- traefik.http.routers.arsenaliq-web.entrypoints=${TRAEFIK_ENTRYPOINT:-websecure} - traefik.http.routers.arsenaliq-web.entrypoints=${TRAEFIK_ENTRYPOINT:-websecure}
- traefik.http.routers.arsenaliq-web.tls=true - traefik.http.routers.arsenaliq-web.tls=true
- traefik.http.services.arsenaliq-web.loadbalancer.server.port=3000 - traefik.http.services.arsenaliq-web.loadbalancer.server.port=3000
networks: networks:
- app - arsenal_iq
- traefik_proxy - traefik
networks: networks:
app: arsenal_iq:
driver: bridge driver: bridge
traefik_proxy: traefik:
external: true external: true
name: ${TRAEFIK_NETWORK:-traefik_proxy} name: ${TRAEFIK_NETWORK:-traefik}
docker-compose.yml
+16 -6
View File
@@ -9,15 +9,13 @@ services:
volumes: volumes:
- ./data/postgres:/var/lib/postgresql/data - ./data/postgres:/var/lib/postgresql/data
- ./backend/database/init.sql:/docker-entrypoint-initdb.d/01-init.sql:ro - ./backend/database/init.sql:/docker-entrypoint-initdb.d/01-init.sql:ro
ports:
- "5432:5432"
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-arsenal} -d ${POSTGRES_DB:-arsenal_iq}"] test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-arsenal} -d ${POSTGRES_DB:-arsenal_iq}"]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 10 retries: 10
networks: networks:
- app - arsenal_iq
backend: backend:
build: build:
@@ -50,7 +48,7 @@ services:
- ./backend:/app - ./backend:/app
- ./backend/node_modules:/app/node_modules - ./backend/node_modules:/app/node_modules
networks: networks:
- app - arsenal_iq
frontend: frontend:
build: build:
@@ -71,9 +69,21 @@ services:
volumes: volumes:
- ./frontend:/app - ./frontend:/app
- ./frontend/node_modules:/app/node_modules - ./frontend/node_modules:/app/node_modules
labels:
- ${WATCH:-traefik.enable=true}
- "traefik.enable=true"
- "traefik.docker.network=${TRAEFIK_NETWORK:-traefik}"
- "traefik.http.routers.${NAME:-arsenaliq}.rule=Host(`${URL:-arsenal.local}`)"
- "traefik.http.routers.${NAME:-arsenaliq}.entrypoints=${TRAEFIK_ENTRYPOINT:-websecure}"
- "traefik.http.routers.${NAME:-arsenaliq}.tls.certresolver=${TRAEFIK_CERTRESOLVER:-myresolver}"
- "traefik.http.services.${NAME:-arsenaliq}.loadbalancer.server.port=3000"
networks: networks:
- app - arsenal_iq
- traefik
networks: networks:
app: arsenal_iq:
driver: bridge driver: bridge
traefik:
external: true
name: ${TRAEFIK_NETWORK:-traefik}