fix issues for mealie

Author: ahze

Containerfile

@@ -28,9 +28,10 @@ RUN pkg update && \
     pkg clean -ay && \
     rm -rf /var/cache/pkg/* /var/db/pkg/repos/*
 
-# Create directories
-RUN mkdir -p /var/db/postgres/data${PG_VERSION} /var/run/postgresql /run/secrets /docker-entrypoint-initdb.d && \
-    chown -R bsd:bsd /var/db/postgres /var/run/postgresql /run/secrets /docker-entrypoint-initdb.d
+# Create directories (use Linux-compatible paths for drop-in replacement)
+RUN mkdir -p /var/lib/postgresql/data /var/run/postgresql /run/secrets /docker-entrypoint-initdb.d && \
+    chmod 755 /var/lib && \
+    chown -R bsd:bsd /var/lib/postgresql /var/run/postgresql /run/secrets /docker-entrypoint-initdb.d
 
 # Copy service definitions and init scripts
 COPY root/ /
@@ -39,13 +40,13 @@ COPY root/ /
 RUN chmod +x /etc/services.d/*/run /etc/cont-init.d/* 2>/dev/null || true
 
 # Store PG version for scripts
-RUN echo "${PG_VERSION}" > /var/db/postgres/pg_version
+RUN mkdir -p /var/db/postgres && echo "${PG_VERSION}" > /var/db/postgres/pg_version
 
 # Extract package version for tagging (e.g., 17.7 or 14.20)
 RUN mkdir -p /app && \
     pkg query '%v' postgresql${PG_VERSION}-server | sed 's/_.*$//' > /app/version
 
-ENV PGDATA="/var/db/postgres/data${PG_VERSION}" \
+ENV PGDATA="/var/lib/postgresql/data" \
     PG_VERSION="${PG_VERSION}" \
     POSTGRES_USER="postgres" \
     POSTGRES_PASSWORD="" \
@@ -54,4 +55,4 @@ ENV PGDATA="/var/db/postgres/data${PG_VERSION}" \
     POSTGRES_HOST_AUTH_METHOD="scram-sha-256"
 
 EXPOSE 5432
-VOLUME /var/db/postgres
+VOLUME /var/lib/postgresql/data

README.md

@@ -1,6 +1,6 @@
 # PostgreSQL
 
-PostgreSQL database server on FreeBSD.
+PostgreSQL database server on FreeBSD. **Drop-in replacement** for the official `postgres` Docker image.
 
 > **Requires [patched ocijail](https://github.com/daemonless/daemonless#ocijail-patch)** for SysV IPC support (`org.freebsd.jail.allow.sysvipc=true`)
 
@@ -10,7 +10,7 @@ PostgreSQL database server on FreeBSD.
 podman run -d --name postgres \
   -p 5432:5432 \
   -e POSTGRES_PASSWORD=mysecretpassword \
-  -v /path/to/data:/var/db/postgres \
+  -v /path/to/data:/var/lib/postgresql/data \
   --annotation 'org.freebsd.jail.allow.sysvipc=true' \
   ghcr.io/daemonless/postgres:17
 ```
@@ -27,7 +27,7 @@ services:
       - POSTGRES_PASSWORD=mysecretpassword
       - POSTGRES_DB=mydb
     volumes:
-      - /data/postgres:/var/db/postgres
+      - /data/postgres:/var/lib/postgresql/data
     ports:
       - 5432:5432
     annotations:
@@ -56,7 +56,7 @@ services:
 | `POSTGRES_USER` | `postgres` | Database superuser name |
 | `POSTGRES_PASSWORD` | (empty) | Superuser password |
 | `POSTGRES_DB` | `postgres` | Default database name |
-| `PGDATA` | `/var/db/postgres/dataXX` | Data directory (XX = version) |
+| `PGDATA` | `/var/lib/postgresql/data` | Data directory |
 | `POSTGRES_INITDB_ARGS` | (empty) | Extra args for initdb (e.g., `--data-checksums`) |
 | `POSTGRES_HOST_AUTH_METHOD` | `scram-sha-256` | Auth method (`scram-sha-256`, `md5`, `trust`) |
 
@@ -84,7 +84,7 @@ Scripts run in sorted filename order after database creation.
 
 | Path | Description |
 |------|-------------|
-| `/var/db/postgres` | PostgreSQL data directory |
+| `/var/lib/postgresql/data` | PostgreSQL data directory |
 
 ## Ports
 
@@ -96,6 +96,64 @@ Scripts run in sorted filename order after database creation.
 
 - **User:** `bsd` (UID/GID 1000)
 
+## Migrating from Linux
+
+**You cannot copy a Linux postgres data directory directly to FreeBSD.** PostgreSQL stores locale information (`en_US.utf8`) in the database cluster, and FreeBSD uses a different locale format (`en_US.UTF-8`). Attempting to use copied data will fail with:
+
+```
+FATAL: database locale is incompatible with operating system
+DETAIL: The database was initialized with LC_COLLATE "en_US.utf8", which is not recognized by setlocale().
+```
+
+### Migration Steps
+
+1. **Dump from Linux** (while postgres is running):
+   ```bash
+   podman exec postgres pg_dump -U myuser mydb > mydb.sql
+   ```
+
+2. **Start fresh FreeBSD postgres**:
+   ```bash
+   podman run -d --name postgres \
+     -e POSTGRES_USER=myuser \
+     -e POSTGRES_PASSWORD=mypassword \
+     -e POSTGRES_DB=mydb \
+     -v /containers/myapp/pgdata:/var/lib/postgresql/data \
+     --annotation 'org.freebsd.jail.allow.sysvipc=true' \
+     ghcr.io/daemonless/postgres:17
+   ```
+
+3. **Restore the dump**:
+   ```bash
+   cat mydb.sql | podman exec -i postgres psql -U myuser -d mydb
+   ```
+
+### Full Database Cluster Migration
+
+To migrate all databases and roles:
+
+```bash
+# On source (Linux or FreeBSD)
+podman exec postgres pg_dumpall -U postgres > all_databases.sql
+
+# On target (after starting fresh postgres)
+cat all_databases.sql | podman exec -i postgres psql -U postgres
+```
+
+## Migrating from FreeBSD to Linux
+
+The same locale incompatibility applies in reverse. FreeBSD uses `C` or `en_US.UTF-8` locales, which Linux postgres may not recognize. Use pg_dump/restore:
+
+```bash
+# On FreeBSD
+podman exec postgres pg_dump -U myuser mydb > mydb.sql
+
+# On Linux (after starting fresh postgres)
+cat mydb.sql | podman exec -i postgres psql -U myuser -d mydb
+```
+
+**Bottom line:** Always use `pg_dump`/`pg_restore` when moving postgres data between Linux and FreeBSD, regardless of direction.
+
 ## Links
 
 - [PostgreSQL Website](https://www.postgresql.org/)

root/etc/cont-init.d/10-postgres-config

@@ -14,15 +14,15 @@ for var in $(env | grep '_FILE=' | cut -d= -f1); do
     fi
 done
 
-PG_VERSION=$(cat /var/db/postgres/pg_version 2>/dev/null || echo "17")
-PGDATA="/var/db/postgres/data${PG_VERSION}"
+# Use Linux-compatible path for drop-in replacement
+PGDATA="/var/lib/postgresql/data"
 
-echo "Setting up PostgreSQL ${PG_VERSION}..."
+echo "Setting up PostgreSQL..."
 
 # Create required directories
 mkdir -p "$PGDATA" /var/run/postgresql
 
 # Set ownership (bsd:bsd is UID/GID 1000:1000)
-chown -R bsd:bsd /var/db/postgres /var/run/postgresql
+chown -R bsd:bsd /var/lib/postgresql /var/run/postgresql
 
 echo "PostgreSQL configuration complete"

root/etc/services.d/postgresql/run

@@ -1,12 +1,12 @@
 #!/bin/sh
 # PostgreSQL s6 service
 
-PG_VERSION=$(cat /var/db/postgres/pg_version 2>/dev/null || echo "17")
-PGDATA="/var/db/postgres/data${PG_VERSION}"
+# Use Linux-compatible path for drop-in replacement
+PGDATA="/var/lib/postgresql/data"
 
 # Initialize database if needed
 if [ ! -f "$PGDATA/PG_VERSION" ]; then
-    echo "Initializing PostgreSQL ${PG_VERSION} database..."
+    echo "Initializing PostgreSQL database..."
 
     # Build initdb command with optional args
     INITDB_CMD="/usr/local/bin/initdb -D $PGDATA -E UTF8 --locale=C"
@@ -79,5 +79,5 @@ if [ ! -f "$PGDATA/PG_VERSION" ]; then
     /usr/local/bin/s6-setuidgid bsd /usr/local/bin/pg_ctl -D "$PGDATA" -w stop
 fi
 
-echo "Starting PostgreSQL ${PG_VERSION}..."
+echo "Starting PostgreSQL..."
 exec /usr/local/bin/s6-setuidgid bsd /usr/local/bin/postgres -D "$PGDATA"