fix user creation

Author: ahze

Containerfile

@@ -4,7 +4,7 @@ FROM ghcr.io/daemonless/base:${BASE_VERSION}
 ARG PG_VERSION
 
 ARG FREEBSD_ARCH=amd64
-ARG PACKAGES="postgresql${PG_VERSION}-server postgresql${PG_VERSION}-client"
+ARG PACKAGES="postgresql${PG_VERSION}-server postgresql${PG_VERSION}-client postgresql${PG_VERSION}-contrib"
 ARG UPSTREAM_URL="https://www.postgresql.org/docs/release/"
 ARG HEALTHCHECK_ENDPOINT="pg_isready -q"
 

root/etc/services.d/postgresql/run

@@ -27,13 +27,23 @@ if [ ! -f "$PGDATA/PG_VERSION" ]; then
     # Start temporarily to create user/database and run init scripts
     /usr/local/bin/s6-setuidgid bsd /usr/local/bin/pg_ctl -D "$PGDATA" -w start
 
-    # Create user and database if specified
+    # Create user if not default 'bsd' user
+    PGUSER="${POSTGRES_USER:-postgres}"
+    if [ "$PGUSER" != "bsd" ]; then
+        echo "Creating user '$PGUSER'..."
+        /usr/local/bin/s6-setuidgid bsd /usr/local/bin/psql -d postgres -c "CREATE ROLE $PGUSER WITH LOGIN SUPERUSER" 2>/dev/null || true
+    fi
+
+    # Set password if specified
     if [ -n "$POSTGRES_PASSWORD" ]; then
-        /usr/local/bin/s6-setuidgid bsd /usr/local/bin/psql -c "ALTER USER $POSTGRES_USER PASSWORD '$POSTGRES_PASSWORD'" 2>/dev/null
+        echo "Setting password for '$PGUSER'..."
+        /usr/local/bin/s6-setuidgid bsd /usr/local/bin/psql -d postgres -c "ALTER ROLE $PGUSER PASSWORD '$POSTGRES_PASSWORD'" 2>/dev/null
     fi
 
+    # Create database if specified and not 'postgres'
     if [ -n "$POSTGRES_DB" ] && [ "$POSTGRES_DB" != "postgres" ]; then
-        /usr/local/bin/s6-setuidgid bsd /usr/local/bin/createdb "$POSTGRES_DB" 2>/dev/null
+        echo "Creating database '$POSTGRES_DB'..."
+        /usr/local/bin/s6-setuidgid bsd /usr/local/bin/createdb -O "$PGUSER" "$POSTGRES_DB" 2>/dev/null || true
     fi
 
     # Run init scripts from /docker-entrypoint-initdb.d/