From e727d070250127d83920acf0e06930fc17d79cf5 Mon Sep 17 00:00:00 2001 From: peskyadmin Date: Sun, 2 Aug 2026 18:22:54 -0400 Subject: [PATCH] fix: ensure both db and app services depend on {{service}}-ts --- docker-compose.yml | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1106e40..c1553e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,15 +8,46 @@ services: - TS_LOGIN_SERVER=${TS_LOGIN_SERVER} - TS_STATE_DIR=/var/lib/tailscale - TS_SERVE_CONFIG=/config/serve.json + - TS_EXTRA_ARGS=--login-server=${TS_LOGIN_SERVER} volumes: - ./tailscale/tailscale-data:/var/lib/tailscale - ./tailscale/config:/config - /dev/net/tun:/dev/net/tun cap_add: - net_admin - - sys_module restart: unless-stopped - {{service-compose}} + + db: + image: postgres:15 + environment: + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_USER: ${POSTGRES_USER} + POSTGRES_DB: ${POSTGRES_DB} + volumes: + - {{service}}-db-data:/var/lib/postgresql/data + depends_on: + - {{service}}-ts network_mode: service:{{service}}-ts - depends_on: - - {{service}}-ts \ No newline at end of file + restart: unless-stopped + + {{service}}: + image: {{service}}/{{service}}:latest + environment: + {{SERVICE}}_DATABASE_TYPE: postgres + {{SERVICE}}_DATABASE_HOST: 127.0.0.1 + {{SERVICE}}_DATABASE_USER: ${POSTGRES_USER} + {{SERVICE}}_DATABASE_PASSWORD: ${POSTGRES_PASSWORD} + {{SERVICE}}_DATABASE_DATABASE: ${POSTGRES_DB} + {{SERVICE}}_SERVICE_JWTSECRET: ${{{SERVICE}}_SERVICE_JWTSECRET} + {{SERVICE}}_SERVICE_PUBLICURL: ${{{SERVICE}}_SERVICE_PUBLICURL} + {{SERVICE}}_SERVICE_FRONTENDURL: ${{{SERVICE}}_SERVICE_FRONTENDURL} + volumes: + - ./files:/app/{{service}}/files + depends_on: + - {{service}}-ts + - db + network_mode: service:{{service}}-ts + restart: unless-stopped + +volumes: + {{service}}-db-data: