switch to s6-rc

Dockerfile

@@ -1,8 +1,11 @@
 FROM thallian/confd-env:latest
 
-ENV PGDATA /var/lib/postgresql/data
+ENV PGDATA=/var/lib/postgresql/data
+ENV S6_KEEP_ENV=1
 
-RUN apk add --no-cache postgresql14 postgresql14-contrib
+RUN apk add --no-cache \
+	postgresql14 \
+	postgresql14-contrib
 
 RUN mkdir -p /run/postgresql && mkdir -p $PGDATA
 RUN chown -R postgres /run/postgresql && chown -R postgres $PGDATA

rootfs/bin/db-password

@@ -0,0 +1,9 @@
+#!/command/with-contenv sh
+
+echo "local all all trust" > "$PGDATA/pg_hba.conf"
+
+pg_ctl -D "$PGDATA" -o "-c listen_addresses='localhost'" -w start
+
+psql --command "ALTER USER postgres WITH PASSWORD '${POSTGRES_PASSWORD}';"
+
+pg_ctl -D "$PGDATA" -o "-c listen_addresses='localhost'" -w stop

rootfs/bin/initdb

@@ -0,0 +1,5 @@
+#!/command/with-contenv sh
+
+if [ ! -f "/var/lib/postgresql/data/PG_VERSION" ]; then
+    s6-setuidgid postgres initdb --username=postgres
+fi

rootfs/etc/cont-init.d/00-initdb

@@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv sh
-
-if [ ! -f ${PGDATA}/PG_VERSION ]; then
-    s6-setuidgid postgres initdb --username=postgres
-fi

rootfs/etc/cont-init.d/00-password

@@ -1,11 +0,0 @@
-#!/usr/bin/with-contenv sh
-
-cat <<EOF > /var/lib/postgresql/data/pg_hba.conf
-local all all trust
-EOF
-
-s6-setuidgid postgres pg_ctl -D "$PGDATA" -o "-c listen_addresses='localhost'" -w start
-
-s6-setuidgid postgres psql --command "ALTER USER postgres WITH PASSWORD '${POSTGRES_PASSWORD}';"
-
-s6-setuidgid postgres pg_ctl -D "$PGDATA" -o "-c listen_addresses='localhost'" -w stop

rootfs/etc/fix-attrs.d/01-pgdata

@@ -1 +0,0 @@
-/var/lib/postgresql true postgres 0600 0700

rootfs/etc/s6-overlay/s6-rc.d/confd/dependencies

@@ -0,0 +1,2 @@
+initdb
+db-password

rootfs/etc/s6-overlay/s6-rc.d/db-password/dependencies

@@ -0,0 +1 @@
+initdb

rootfs/etc/s6-overlay/s6-rc.d/db-password/type

@@ -0,0 +1 @@
+oneshot

rootfs/etc/s6-overlay/s6-rc.d/db-password/up

@@ -0,0 +1 @@
+s6-setuidgid postgres db-password

rootfs/etc/s6-overlay/s6-rc.d/initdb/type

@@ -0,0 +1 @@
+oneshot

rootfs/etc/s6-overlay/s6-rc.d/initdb/up

@@ -0,0 +1 @@
+ s6-setuidgid postgres initdb

rootfs/etc/s6-overlay/s6-rc.d/postgres/dependencies

@@ -0,0 +1,3 @@
+initdb
+db-password
+confd

rootfs/etc/s6-overlay/s6-rc.d/postgres/run

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/command/with-contenv sh
 
 exec s6-setuidgid postgres postgres \
     -D $PGDATA \

rootfs/etc/s6-overlay/s6-rc.d/postgres/type

@@ -0,0 +1 @@
+longrun