Updated Tianji

cpn-tianji/docker-compose.yml

@@ -1,46 +1,56 @@
-name: cpn-tianji
-services:
-  app_proxy:
-    environment:
-      APP_HOST: tianji_server_1
-      APP_PORT: 5555
-      PROXY_AUTH_ADD: "false"
+version: "3.8"
 
+services:
   cpn-tianji:
+    image: moonrailgun/tianji:1.31.8@sha256:86b58556fa9ff5454cb4eeddc2330124244733820a56b5491c8c0e4399880c68
     container_name: cpn-tianji
-    image: moonrailgun/tianji:1.31.8
+    hostname: cpn-tianji
     restart: unless-stopped
+    stop_grace_period: 1m
+    ports:
+      - ${APP_TIANJI_PORT:-12345}:12345
     environment:
-      DATABASE_URL: postgresql://tianji-user:227453b7-1286-48cc-b471-1c269495c5fc@cpn-tianji-db:5432/tianji
-      JWT_SECRET: replace-me-with-a-random-string
+      DATABASE_URL: postgresql://tianji-user:${APP_PASSWORD}@cpn-tianji-db:5432/tianji
+      JWT_SECRET: ${APP_SEED}
       ALLOW_REGISTER: "false"
       ALLOW_OPENAPI: "true"
-    ports:
-      - "12345:12345"
+      PUBLIC_URL: "http://${DEVICE_DOMAIN_NAME}:${APP_TIANJI_PORT:-12345}"
+    volumes:
+      - ${APP_DATA_DIR}/data/configs:/app/data/configs
+      - ${APP_DATA_DIR}/data/icons:/app/public/icons
+      - ${APP_DATA_DIR}/data:/data
+    depends_on:
+      cpn-tianji-db:
+        condition: service_healthy
     networks:
       - cpn_tianji_network
-    depends_on:
-      - cpn-tianji-db
+
   cpn-tianji-db:
-    container_name: cpn-tianji-db
     image: postgres:15.4-alpine
+    container_name: cpn-tianji-db
+    hostname: cpn-tianji-db
+    restart: unless-stopped
     environment:
       POSTGRES_DB: tianji
       POSTGRES_USER: tianji-user
-      POSTGRES_PASSWORD: 227453b7-1286-48cc-b471-1c269495c5fc
+      POSTGRES_PASSWORD: ${APP_PASSWORD}
+      PGDATA: /var/lib/postgresql/data/pgdata
     volumes:
-      - tianji_pgdata:/var/lib/postgresql/data
-    restart: always
+      - tianji_pgdata:/var/lib/postgresql/data/pgdata
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      test: ["CMD-SHELL", "pg_isready -U tianji-user -d tianji"]
       interval: 5s
       timeout: 5s
       retries: 5
+      start_period: 30s
     networks:
       - cpn_tianji_network
+
 networks:
   cpn_tianji_network:
+    name: cpn_tianji_network
     driver: bridge
+
 volumes:
   tianji_pgdata:
     name: tianji_pgdata