From 30e915c3837c273f81ceb00f17307034c88a2246 Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Fri, 26 Sep 2025 11:56:29 +0900
Subject: [PATCH] Using PostgreSQL 18 as default

---
 .env                   | 4 ++--
 compose_databases.yaml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.env b/.env
index 0fe02ed56..bde6e3015 100644
--- a/.env
+++ b/.env
@@ -25,9 +25,9 @@ ZABBIX_WEB_SERVICE_IMAGE=zabbix/zabbix-web-service
 MYSQL_IMAGE=mysql
 MYSQL_IMAGE_TAG=8.4-oracle
 POSTGRESQL_IMAGE=postgres
-POSTGRESQL_IMAGE_TAG=17-alpine
+POSTGRESQL_IMAGE_TAG=18-alpine
 #POSTGRESQL_IMAGE=timescale/timescaledb
-#POSTGRESQL_IMAGE_TAG=2.18.1-pg17
+#POSTGRESQL_IMAGE_TAG=2.21.3-pg17
 
 BUSYBOX_IMAGE=busybox
 BUSYBOX_IMAGE_TAG=latest
diff --git a/compose_databases.yaml b/compose_databases.yaml
index 29ce78b5f..99d6ff9fc 100644
--- a/compose_databases.yaml
+++ b/compose_databases.yaml
@@ -45,7 +45,7 @@ services:
   restart: "${RESTART_POLICY}"
   attach: false
   volumes:
-   - ${DATA_DIRECTORY}/var/lib/postgresql/data:/var/lib/postgresql/data:rw
+   - ${DATA_DIRECTORY}/var/lib/postgresql:/var/lib/postgresql:rw
    - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CA_FILE:/run/secrets/root-ca.pem:ro
    - ${ENV_VARS_DIRECTORY}/.ZBX_DB_CERT_FILE:/run/secrets/server-cert.pem:ro
    - ${ENV_VARS_DIRECTORY}/.ZBX_DB_KEY_FILE:/run/secrets/server-key.pem:ro
@@ -73,7 +73,7 @@ services:
   image: "${BUSYBOX_IMAGE}:${BUSYBOX_IMAGE_TAG}"
   attach: false
   volumes:
-   - ${DATA_DIRECTORY}/var/lib/postgresql/data:/var/lib/postgresql/data:rw
+   - ${DATA_DIRECTORY}/var/lib/postgresql:/var/lib/postgresql:rw
 
  elasticsearch:
   image: "${ELASTICSEARCH_IMAGE}:${ELASTICSEARCH_IMAGE_TAG}"