merge: align dev branch with main
This commit is contained in:
+8
-13
@@ -1,4 +1,4 @@
|
||||
version: "3.8"
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
# PostgreSQL Database
|
||||
@@ -14,11 +14,7 @@ services:
|
||||
ports:
|
||||
- "5432:5432"
|
||||
healthcheck:
|
||||
test:
|
||||
[
|
||||
"CMD-SHELL",
|
||||
"pg_isready -U ${POSTGRES_USER:-headquarter} -d ${POSTGRES_DB:-headquarter}",
|
||||
]
|
||||
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-headquarter} -d ${POSTGRES_DB:-headquarter}"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
@@ -61,9 +57,8 @@ services:
|
||||
REPO_BASE_PATH: /data/repos
|
||||
INSTANCE_BASE_PATH: /data/instances
|
||||
volumes:
|
||||
- /data/repos:/data/repos
|
||||
- /data/working-copies:/data/working-copies
|
||||
- /data/instances:/data/instances
|
||||
- repo_data:/data/repos
|
||||
- instance_data:/data/instances
|
||||
ports:
|
||||
- "8000:8000"
|
||||
depends_on:
|
||||
@@ -81,12 +76,10 @@ services:
|
||||
context: ./apps/web
|
||||
dockerfile: Dockerfile
|
||||
args:
|
||||
VITE_API_BASE_URL: ${VITE_API_BASE_URL:-http://localhost:8000}
|
||||
VITE_APP_URL: ${VITE_APP_URL:-http://localhost:3000}
|
||||
VITE_API_BASE_URL: http://localhost:8000
|
||||
container_name: hq-web
|
||||
environment:
|
||||
# These are only for documentation; Vite bakes values at build time.
|
||||
VITE_API_BASE_URL: ${VITE_API_BASE_URL:-http://localhost:8000}
|
||||
VITE_API_BASE_URL: http://localhost:8000
|
||||
ports:
|
||||
- "3000:80"
|
||||
depends_on:
|
||||
@@ -98,6 +91,8 @@ services:
|
||||
volumes:
|
||||
postgres_data:
|
||||
redis_data:
|
||||
repo_data:
|
||||
instance_data:
|
||||
|
||||
networks:
|
||||
backend:
|
||||
|
||||
Reference in New Issue
Block a user