v4.0.7

Signed-off-by: TIANHE <[email protected]>

Author: tianhe

.env.example

@@ -8,6 +8,21 @@
 # BACKEND_PORT=127.0.0.1:5000
 # DB_PORT=127.0.0.1:5432
 
+# PostgreSQL image/data overrides.
+# Default compose now uses postgres:18.3-alpine with PGDATA=/var/lib/postgresql/18/docker.
+# To reuse an existing 1Panel PostgreSQL 18 data directory, stop the old DB first,
+# then point POSTGRES_DATA_SOURCE to the host directory that contains PG_VERSION.
+# Example for 1Panel PostgreSQL with:
+#   host mount: /opt/1panel/apps/postgresql/postgresql/data -> /var/lib/postgresql
+#   PGDATA:     /var/lib/postgresql/18/docker
+# use:
+# POSTGRES_IMAGE=postgres:18.3-alpine
+# POSTGRES_DATA_SOURCE=/opt/1panel/apps/postgresql/postgresql/data/18/docker
+# POSTGRES_PGDATA=/var/lib/postgresql/18/docker
+# POSTGRES_USER=user_from_old_container
+# POSTGRES_PASSWORD=password_from_old_container
+# POSTGRES_DB=quantdinger
+
 # Global image source switch
 # Leave empty for official Docker Hub:
 # IMAGE_PREFIX=

docker-compose.ghcr.yml

@@ -38,13 +38,14 @@
 
 services:
   postgres:
-    image: ${IMAGE_PREFIX:-}postgres:16-alpine
+    image: ${POSTGRES_IMAGE:-${IMAGE_PREFIX:-}postgres:18.3-alpine}
     container_name: quantdinger-db
     restart: unless-stopped
     environment:
       POSTGRES_DB: ${POSTGRES_DB:-quantdinger}
       POSTGRES_USER: ${POSTGRES_USER:-quantdinger}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-quantdinger123}
+      PGDATA: ${POSTGRES_PGDATA:-/var/lib/postgresql/18/docker}
       TZ: ${TZ:-Asia/Shanghai}
     command:
       - "postgres"
@@ -53,7 +54,7 @@ services:
       - "-c"
       - "shared_buffers=${PG_SHARED_BUFFERS:-256MB}"
     volumes:
-      - postgres_data:/var/lib/postgresql/data
+      - ${POSTGRES_DATA_SOURCE:-postgres_data}:${POSTGRES_PGDATA:-/var/lib/postgresql/18/docker}
     ports:
       - "${DB_PORT:-127.0.0.1:5432}:5432"
     networks:

docker-compose.yml

@@ -29,13 +29,14 @@ services:
   # PostgreSQL Database
   # ========================
   postgres:
-    image: ${IMAGE_PREFIX:-}postgres:16-alpine
+    image: ${POSTGRES_IMAGE:-${IMAGE_PREFIX:-}postgres:18.3-alpine}
     container_name: quantdinger-db
     restart: unless-stopped
     environment:
       POSTGRES_DB: ${POSTGRES_DB:-quantdinger}
       POSTGRES_USER: ${POSTGRES_USER:-quantdinger}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-quantdinger123}
+      PGDATA: ${POSTGRES_PGDATA:-/var/lib/postgresql/18/docker}
       TZ: ${TZ:-Asia/Shanghai}
     # Raise PostgreSQL's max_connections so the backend pool (default
     # DB_POOL_MAX=50) plus psql/admin connections never exceed PG's own
@@ -47,7 +48,7 @@ services:
       - "-c"
       - "shared_buffers=${PG_SHARED_BUFFERS:-256MB}"
     volumes:
-      - postgres_data:/var/lib/postgresql/data
+      - ${POSTGRES_DATA_SOURCE:-postgres_data}:${POSTGRES_PGDATA:-/var/lib/postgresql/18/docker}
       - ./backend_api_python/migrations/init.sql:/docker-entrypoint-initdb.d/01-init.sql
     ports:
       - "${DB_PORT:-127.0.0.1:5432}:5432"