Merge pull request #365 from s01ipsist/postgres18

Postgres 18

Author: josegonzalez

Dockerfile

@@ -1 +1 @@
-FROM postgres:17.5
+FROM postgres:18.1

README.md

@@ -1,6 +1,6 @@
 # dokku postgres [![Build Status](https://img.shields.io/github/actions/workflow/status/dokku/dokku-postgres/ci.yml?branch=master&style=flat-square "Build Status")](https://github.com/dokku/dokku-postgres/actions/workflows/ci.yml?query=branch%3Amaster) [![IRC Network](https://img.shields.io/badge/irc-libera-blue.svg?style=flat-square "IRC Libera")](https://webchat.libera.chat/?channels=dokku)
 
-Official postgres plugin for dokku. Currently defaults to installing [postgres 17.5](https://hub.docker.com/_/postgres/).
+Official postgres plugin for dokku. Currently defaults to installing [postgres 18.1](https://hub.docker.com/_/postgres/).
 
 ## Requirements
 

functions

@@ -78,6 +78,14 @@ service_create_container() {
 
   rm -f "$SERVICE_ROOT/ID"
   declare -a DOCKER_ARGS
+
+  # Determine correct data directory for PostgreSQL version
+  local DATA_DIR="/var/lib/postgresql/data"
+  local PG_MAJOR="${PLUGIN_IMAGE_VERSION%%[^0-9]*}"
+  if [[ -n "$PG_MAJOR" && "$PG_MAJOR" -ge 18 ]]; then
+    DATA_DIR="/var/lib/postgresql"
+  fi
+
   DOCKER_ARGS=()
   DOCKER_ARGS+=("--cidfile=$SERVICE_ROOT/ID")
   DOCKER_ARGS+=("--env-file=$SERVICE_ROOT/ENV")
@@ -87,7 +95,7 @@ service_create_container() {
   DOCKER_ARGS+=("--label=dokku=service")
   DOCKER_ARGS+=("--name=$SERVICE_NAME")
   DOCKER_ARGS+=("--restart=always")
-  DOCKER_ARGS+=("--volume=$SERVICE_HOST_ROOT/data:/var/lib/postgresql/data")
+  DOCKER_ARGS+=("--volume=$SERVICE_HOST_ROOT/data:$DATA_DIR")
 
   declare -a LINK_CONTAINER_DOCKER_ARGS
   LINK_CONTAINER_DOCKER_ARGS=()
@@ -150,7 +158,7 @@ service_create_container() {
   dokku_log_verbose_quiet "Securing connection to database"
   service_pause "$SERVICE" >/dev/null
   "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/scripts/create_ssl_certs.sh" "$SERVICE_ROOT" &>/dev/null
-  "$DOCKER_BIN" container run --rm -i -v "$SERVICE_HOST_ROOT/data:/var/lib/postgresql/data" -v "$SERVICE_HOST_ROOT/certs:/var/lib/postgresql/certs" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" bash -s <"$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/scripts/enable_ssl.sh" &>/dev/null
+  "$DOCKER_BIN" container run --rm -i -v "$SERVICE_HOST_ROOT/data:$DATA_DIR" -v "$SERVICE_HOST_ROOT/certs:/var/lib/postgresql/certs" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" bash -s <"$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/scripts/enable_ssl.sh" &>/dev/null
   rm -rf "$SERVICE_HOST_ROOT/certs"
 
   suppress_output "$DOCKER_BIN" container start "$(cat "$SERVICE_ROOT/ID")"

scripts/enable_ssl.sh

@@ -2,11 +2,28 @@
 
 set -e
 
-cd /var/lib/postgresql/data
+# Determine data directory: prefer PGDATA if set by the image, otherwise
+# fall back to common location used by Postgres images.
+if [ -n "$PGDATA" ] && [ -d "$PGDATA" ]; then
+	data_dir="$PGDATA"
+elif [ -d /var/lib/postgresql/data ]; then
+	data_dir="/var/lib/postgresql/data"
+else
+	echo "No postgres data directory found" >&2
+	exit 1
+fi
 
-cp ../certs/* .
-chown postgres:postgres server.key
-chmod 600 server.key
+cd "$data_dir"
 
+# Certs are mounted to /var/lib/postgresql/certs by the plugin; copy them
+# into the data directory if present.
+certs_src="/var/lib/postgresql/certs"
+if [ -d "$certs_src" ] && [ "$(ls -A "$certs_src" 2>/dev/null || true)" ]; then
+	cp "$certs_src"/* .
+	chown postgres:postgres server.key
+	chmod 600 server.key
+fi
+
+# Enable SSL in postgresql.conf
 sed -i "s/^#ssl = off/ssl = on/" postgresql.conf
 sed -i "s/^#ssl_ciphers =.*/ssl_ciphers = 'AES256+EECDH:AES256+EDH'/" postgresql.conf