From 5aa6aab6ec24f79e5c468b0dfcf36b0d4da1e682 Mon Sep 17 00:00:00 2001
From: pooneyy <85266337+pooneyy@users.noreply.github.com>
Date: Sun, 2 Nov 2025 01:37:46 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(postgresql):=20add=20postgresq?=
 =?UTF-8?q?l=2018.0=20support=20and=20update=20existing=20versions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- add new postgresql 18.0 and 18.0-alpine versions with complete configuration
- include data.yml files with form fields for data persistence, passwords, ports, users, and database names
- update existing postgresql versions: 16.9 to 16.10 and 17.5 to 17.6
---
 .../postgresql/16.9-alpine/docker-compose.yml |  2 +-
 apps/postgresql/16.9/docker-compose.yml       |  2 +-
 .../postgresql/17.5-alpine/docker-compose.yml |  2 +-
 apps/postgresql/17.5/docker-compose.yml       |  2 +-
 apps/postgresql/18.0-alpine/data.yml          | 40 +++++++++++++++++++
 .../postgresql/18.0-alpine/docker-compose.yml | 22 ++++++++++
 apps/postgresql/18.0/data.yml                 | 40 +++++++++++++++++++
 apps/postgresql/18.0/docker-compose.yml       | 22 ++++++++++
 8 files changed, 128 insertions(+), 4 deletions(-)
 create mode 100644 apps/postgresql/18.0-alpine/data.yml
 create mode 100644 apps/postgresql/18.0-alpine/docker-compose.yml
 create mode 100644 apps/postgresql/18.0/data.yml
 create mode 100644 apps/postgresql/18.0/docker-compose.yml

diff --git a/apps/postgresql/16.9-alpine/docker-compose.yml b/apps/postgresql/16.9-alpine/docker-compose.yml
index 742b8bc49..97ee1e7bc 100644
--- a/apps/postgresql/16.9-alpine/docker-compose.yml
+++ b/apps/postgresql/16.9-alpine/docker-compose.yml
@@ -4,7 +4,7 @@ networks:
 
 services:
   postgresql:
-    image: postgres:16.9-alpine
+    image: postgres:16.10-alpine
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"
diff --git a/apps/postgresql/16.9/docker-compose.yml b/apps/postgresql/16.9/docker-compose.yml
index e29a971b5..75f670549 100644
--- a/apps/postgresql/16.9/docker-compose.yml
+++ b/apps/postgresql/16.9/docker-compose.yml
@@ -4,7 +4,7 @@ networks:
 
 services:
   postgresql:
-    image: postgres:16.9
+    image: postgres:16.10
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"
diff --git a/apps/postgresql/17.5-alpine/docker-compose.yml b/apps/postgresql/17.5-alpine/docker-compose.yml
index 9014f5656..ba593e50b 100644
--- a/apps/postgresql/17.5-alpine/docker-compose.yml
+++ b/apps/postgresql/17.5-alpine/docker-compose.yml
@@ -4,7 +4,7 @@ networks:
 
 services:
   postgresql:
-    image: postgres:17.5-alpine
+    image: postgres:17.6-alpine
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"
diff --git a/apps/postgresql/17.5/docker-compose.yml b/apps/postgresql/17.5/docker-compose.yml
index a633393db..80b7be965 100644
--- a/apps/postgresql/17.5/docker-compose.yml
+++ b/apps/postgresql/17.5/docker-compose.yml
@@ -4,7 +4,7 @@ networks:
 
 services:
   postgresql:
-    image: postgres:17.5
+    image: postgres:17.6
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"
diff --git a/apps/postgresql/18.0-alpine/data.yml b/apps/postgresql/18.0-alpine/data.yml
new file mode 100644
index 000000000..b7fe98de7
--- /dev/null
+++ b/apps/postgresql/18.0-alpine/data.yml
@@ -0,0 +1,40 @@
+additionalProperties:
+  formFields:
+    - default: "./data"
+      edit: true
+      envKey: POSTGRES_ROOT_PATH
+      labelZh: 数据持久化路径
+      labelEn: Data persistence path
+      required: true
+      type: text
+    - default: ""
+      edit: false
+      envKey: POSTGRES_PASSWORD
+      labelZh: Postgres 密码 (首次生效)
+      labelEn: Postgres Password (First Time)
+      required: true
+      random: true
+      rule: paramComplexity
+      type: password
+    - default: 5432
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelZh: Postgres 端口
+      labelEn: Postgres Port
+      required: true
+      rule: paramPort
+      type: number
+    - default: "postgres"
+      edit: false
+      envKey: POSTGRES_USER
+      labelZh: Postgres 用户（不建议改动）
+      labelEn: Postgres User
+      required: false
+      type: text
+    - default: "postgres"
+      edit: false
+      envKey: POSTGRES_DB
+      labelZh: Postgres 数据库名称（不建议改动）
+      labelEn: Postgres Database Name
+      required: false
+      type: text
diff --git a/apps/postgresql/18.0-alpine/docker-compose.yml b/apps/postgresql/18.0-alpine/docker-compose.yml
new file mode 100644
index 000000000..126e04056
--- /dev/null
+++ b/apps/postgresql/18.0-alpine/docker-compose.yml
@@ -0,0 +1,22 @@
+networks:
+  1panel-network:
+    external: true
+
+services:
+  postgresql:
+    image: postgres:18.0-alpine
+    container_name: ${CONTAINER_NAME}
+    labels:
+      createdBy: "Apps"
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:5432
+    volumes:
+      - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_USER: ${POSTGRES_USER:-postgres}
+      POSTGRES_DB: ${POSTGRES_DB:-postgres}
+      POSTGRES_INITDB_ARGS: "--data-checksums"
diff --git a/apps/postgresql/18.0/data.yml b/apps/postgresql/18.0/data.yml
new file mode 100644
index 000000000..b7fe98de7
--- /dev/null
+++ b/apps/postgresql/18.0/data.yml
@@ -0,0 +1,40 @@
+additionalProperties:
+  formFields:
+    - default: "./data"
+      edit: true
+      envKey: POSTGRES_ROOT_PATH
+      labelZh: 数据持久化路径
+      labelEn: Data persistence path
+      required: true
+      type: text
+    - default: ""
+      edit: false
+      envKey: POSTGRES_PASSWORD
+      labelZh: Postgres 密码 (首次生效)
+      labelEn: Postgres Password (First Time)
+      required: true
+      random: true
+      rule: paramComplexity
+      type: password
+    - default: 5432
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelZh: Postgres 端口
+      labelEn: Postgres Port
+      required: true
+      rule: paramPort
+      type: number
+    - default: "postgres"
+      edit: false
+      envKey: POSTGRES_USER
+      labelZh: Postgres 用户（不建议改动）
+      labelEn: Postgres User
+      required: false
+      type: text
+    - default: "postgres"
+      edit: false
+      envKey: POSTGRES_DB
+      labelZh: Postgres 数据库名称（不建议改动）
+      labelEn: Postgres Database Name
+      required: false
+      type: text
diff --git a/apps/postgresql/18.0/docker-compose.yml b/apps/postgresql/18.0/docker-compose.yml
new file mode 100644
index 000000000..690df74aa
--- /dev/null
+++ b/apps/postgresql/18.0/docker-compose.yml
@@ -0,0 +1,22 @@
+networks:
+  1panel-network:
+    external: true
+
+services:
+  postgresql:
+    image: postgres:18.0
+    container_name: ${CONTAINER_NAME}
+    labels:
+      createdBy: "Apps"
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - ${PANEL_APP_PORT_HTTP}:5432
+    volumes:
+      - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_USER: ${POSTGRES_USER:-postgres}
+      POSTGRES_DB: ${POSTGRES_DB:-postgres}
+      POSTGRES_INITDB_ARGS: "--data-checksums"