v1.0.1 (#2)

Major updates
* Using latest base images
* Upgrade password hash to sha256 and using createuser instead of sql command

Minor updates
* Using new bf-esh executable

Documentation updates
* Fixing versions on readme
* Fixing backup refs in readme
* Update workflow build status shield

Author: bfren

12/Dockerfile

@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.12-2.2.19
+FROM bfren/alpine-s6:alpine3.12-2.2.20
 
 ENV \
     # set to "1" to compress backup sql files

13/Dockerfile

@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpine3.14-2.2.19
+FROM bfren/alpine-s6:alpine3.14-2.2.20
 
 ENV \
     # set to "1" to compress backup sql files

14/Dockerfile

@@ -1,4 +1,4 @@
-FROM bfren/alpine-s6:alpineedge-2.2.19
+FROM bfren/alpine-s6:alpineedge-2.2.20
 
 ENV \
     # set to "1" to compress backup sql files

README.md

@@ -1,11 +1,11 @@
 # Docker PostgreSQL
 
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/bfren/docker-postgresql) ![Docker Pulls](https://img.shields.io/docker/pulls/bfren/postgresql?label=pulls) ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/bfren/postgresql/latest?label=size)<br/>
-![GitHub Workflow Status](https://img.shields.io/github/workflow/status/bfren/docker-postgresql/dev?label=build)
+![GitHub Workflow Status](https://img.shields.io/github/workflow/status/bfren/docker-postgresql/dev-13?label=build)
 
 [Docker Repository](https://hub.docker.com/r/bfren/postgresql) - [bfren ecosystem](https://github.com/bfren/docker)
 
-[PostgreSQL](https://www.postgresql.org/) comes pre-installed (12, 12, or 14) with automatic backups built-in.
+[PostgreSQL](https://www.postgresql.org/) comes pre-installed (12, 13, or 14) with automatic backups built-in.
 
 ## Contents
 
@@ -20,7 +20,7 @@
 
 Backups for every database are stored:
 
-* in the `/var/lib/postgresql/backup` volume
+* in the `/backup` volume
 * in subfolders by date and time (yyMMddhhmm)
 * every eight hours
 

VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

overlay/etc/bf/templates/pg_hba.conf.esh

@@ -88,9 +88,12 @@
 local   all             all                                     trust
 # IPv4 local connections:
 host    all             all             127.0.0.1/32            trust
+# IPv6 local connections:
+host    all             all             ::1/128                 trust
 # Allow replication connections from localhost, by a user with the
 # replication privilege.
 local   replication     all                                     trust
 host    replication     all             127.0.0.1/32            trust
+host    replication     all             ::1/128                 trust
 # Allow network access by authentication
-host    all             all             0.0.0.0/0               md5
+host    all             all             0.0.0.0/0               scram-sha-256

…erlay/etc/bf/templates/postgres.conf.esh …lay/etc/bf/templates/postgresql.conf.eshoverlay/etc/bf/templates/postgres.conf.esh renamed to overlay/etc/bf/templates/postgresql.conf.esh overlay/etc/bf/templates/postgres.conf.esh renamed to overlay/etc/bf/templates/postgresql.conf.esh

@@ -89,7 +89,7 @@ unix_socket_directories = '/run/postgresql,/tmp'	# comma-separated list of direc
 # - Authentication -
 
 #authentication_timeout = 1min		# 1s-600s
-#password_encryption = md5		# md5 or scram-sha-256
+password_encryption = scram-sha-256		# md5 or scram-sha-256
 #db_user_namespace = off
 
 # GSSAPI using Kerberos
@@ -548,7 +548,6 @@ min_wal_size = 80MB
 					#   %q = stop here in non-session
 					#        processes
 					#   %% = '%'
-					# e.g. '<%u%%%d> '
 #log_lock_waits = off			# log lock waits >= deadlock_timeout
 #log_parameter_max_length = -1		# when logging statements, limit logged
 					# bind-parameter values to N bytes;

overlay/etc/cont-init.d/12-postgresql-init

@@ -14,6 +14,10 @@ start () {
     bf-debug "Running db-init."
     s6-setuidgid postgres initdb -D "${POSTGRESQL_DATA}"
 
+    # regenerate configuration
+    bf-debug "Regenerating configuration files."
+    s6-setuidgid postgres ${POSTGRESQL_LIB}/config
+
     # start server
     bf-echo "Starting PostgreSQL for initialisation."
     s6-setuidgid postgres pg_ctl start -D "${POSTGRESQL_DATA}"
@@ -65,16 +69,11 @@ if [ ! -f ${POSTGRESQL_DATA}/PG_VERSION ] ; then
     s6-setuidgid postgres ${POSTGRESQL_LIB}/init
     stop
 
-else
-
-    # be friendly..
-    bf-debug "Server ready."
-
 fi
 
 
 #======================================================================================================================
-# Regenerate configuration.
+# Be friendly.
 #======================================================================================================================
 
-s6-setuidgid postgres ${POSTGRESQL_LIB}/config
+bf-debug "Server ready."

overlay/usr/lib/bf/postgresql/config

@@ -9,8 +9,8 @@ export BF_E=`basename ${0}`
 #======================================================================================================================
 
 bf-echo "Writing PostgreSQL config..."
-esh -o ${POSTGRESQL_DATA}/pg_hba.conf \
-    ${BF_TEMPLATES}/pg_hba.conf.esh
-esh -o ${POSTGRESQL_DATA}/postgres.conf \
-    ${BF_TEMPLATES}/postgres.conf.esh
+bf-esh ${BF_TEMPLATES}/pg_hba.conf.esh \
+    ${POSTGRESQL_DATA}/pg_hba.conf
+bf-esh ${BF_TEMPLATES}/postgresql.conf.esh \
+    ${POSTGRESQL_DATA}/postgresql.conf
 bf-done

overlay/usr/lib/bf/postgresql/init

@@ -18,7 +18,7 @@ export BF_E=`basename ${0}`
 
 # create specified role
 bf-debug "Creating role ${POSTGRESQL_USERNAME}..."
-psql -c "CREATE ROLE ${POSTGRESQL_USERNAME} WITH SUPERUSER LOGIN ENCRYPTED PASSWORD '${POSTGRESQL_PASSWORD}';"
+echo -e "${POSTGRESQL_PASSWORD}\n${POSTGRESQL_PASSWORD}" | createuser --superuser --pwprompt ${POSTGRESQL_USERNAME}
 
 # create database(s)
 bf-debug "Creating..."