feat: Upgrade to postgres 18, remove autofailover as that's not yet supported

Author: marcbachmann

Dockerfile

@@ -13,17 +13,17 @@ ADD ./scripts /scripts
 RUN /scripts/postgres-install && rm /scripts/postgres-install
 
 USER postgres
-ENV PG_MAJOR=17
+ENV PG_MAJOR=18
 ENV PGUSER=postgres
 ENV PGHOST /var/run/postgresql
 ENV PGPORT 5432
 ENV PGDATA /var/lib/postgresql/data
 ENV PAGER 'pspg -s 0'
-ENV PATH="$PATH:/usr/lib/postgresql/17/bin:/scripts"
+ENV PATH="$PATH:/usr/lib/postgresql/18/bin:/scripts"
 ENV WALG_CONFIG_FILE=/var/lib/postgresql/.walg.json
 ENV LANG en_US.utf8
 
-COPY --from=postgres:17.2 /usr/local/bin/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+COPY --from=postgres:18.0 /usr/local/bin/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 ADD ./scripts /scripts
 
 STOPSIGNAL SIGINT

Dockerfile.upgrade

@@ -1,10 +1,10 @@
-FROM livingdocs/postgres:17.2
+FROM livingdocs/postgres:18.0
 USER root
 RUN set -e \
   export DEBIAN_FRONTEND=noninteractive && \
-  apt-get update && apt-get install -y git build-essential postgresql-13 postgresql-14 postgresql-15 postgresql-16  && \
+  apt-get update && apt-get install -y git build-essential postgresql-13 postgresql-14 postgresql-15 postgresql-16 postgresql-17  && \
   # Cleanup
-  apt-get purge -y --auto-remove apt-transport-https git postgresql-server-dev-13 postgresql-server-dev-14 postgresql-server-dev-15 postgresql-server-dev-16 build-essential && \
+  apt-get purge -y --auto-remove apt-transport-https git postgresql-server-dev-13 postgresql-server-dev-14 postgresql-server-dev-15 postgresql-server-dev-16 postgresql-server-dev-17 build-essential && \
   apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/log/*
 
 STOPSIGNAL SIGINT

README.md

@@ -1,9 +1,8 @@
-# [Postgres 17.2](https://github.com/livingdocsIO/dockerfile-postgres) [![](https://img.shields.io/badge/docker-livingdocs%2Fpostgres-blue)](https://hub.docker.com/r/livingdocs/postgres)
+# [Postgres 18.0](https://github.com/livingdocsIO/dockerfile-postgres) [![](https://img.shields.io/badge/docker-livingdocs%2Fpostgres-blue)](https://hub.docker.com/r/livingdocs/postgres)
 
 - Based on Debian
 - Includes `postgres-contrib`, enables the extensions `pg_stat_statements` by default
 - Includes [wal-g](https://github.com/wal-g/wal-g) for WAL archiving and shipping
-- Includes [pg_auto_failover](https://github.com/citusdata/pg_auto_failover) for automatic failover
 - Runs as postgres user with uid (1000), gid (1000)
 - Does not try to fix permissions during boot to support a fast startup
 - Does not have Dockerfile VOLUME declarations and therefore no issues with pg_upgrade --link
@@ -13,7 +12,7 @@
 
 ```bash
 # Secured with a password, by default the image is secure
-docker run -d  --name postgres -p 5432:5432 -v postgres:/var/lib/postgresql -e POSTGRES_PASSWORD=somepassword livingdocs/postgres:17.2
+docker run -d  --name postgres -p 5432:5432 -v postgres:/var/lib/postgresql -e POSTGRES_PASSWORD=somepassword livingdocs/postgres:18.0
 ```
 
 ## Upgrade an existing postgres container
@@ -24,42 +23,42 @@ docker run -d --name postgres -p 5432:5432 -v postgres:/var/lib/postgresql livin
 
 # First stop it, then run the upgrade image
 docker stop postgres
-docker run --rm -v postgres:/var/lib/postgresql livingdocs/postgres:17.2-upgrade
+docker run --rm -v postgres:/var/lib/postgresql -v postgres-socket:/var/run/postgresql livingdocs/postgres:18.0-upgrade
 
 # After it succeeds, you can run the new image and mount the existing volume
-docker run -d --name postgres -p 5432:5432 -v postgres:/var/lib/postgresql livingdocs/postgres:17.2
+docker run -d --name postgres -p 5432:5432 -v postgres:/var/lib/postgresql -v postgres-socket:/var/run/postgresql livingdocs/postgres:18.0
 ```
 
 ## To build this image manually
 
 ```bash
-docker build -t livingdocs/postgres:17.2 .
+docker build -t livingdocs/postgres:18.0 .
 ```
 
 With buildx on docker
 ```bash
 # To build and push the multi-arch manifest to docker hub
-docker buildx build --platform linux/amd64,linux/arm64 -t livingdocs/postgres:17.2 --push .
+docker buildx build --platform linux/amd64,linux/arm64 -t livingdocs/postgres:18.0 --push .
 
-docker buildx build --platform linux/amd64,linux/arm64 -t livingdocs/postgres:17.2-upgrade --push  -f Dockerfile.upgrade .
+docker buildx build --platform linux/amd64,linux/arm64 -t livingdocs/postgres:18.0-upgrade --push  -f Dockerfile.upgrade .
 ```
 
 With nerdctl on lima/containerd
 ```bash
-nerdctl build --platform=amd64,arm64 -t livingdocs/postgres:17.2 .
-nerdctl build --platform=amd64,arm64 -t livingdocs/postgres:17.2-upgrade -f Dockerfile.upgrade .
+nerdctl build --platform=amd64,arm64 -t livingdocs/postgres:18.0 .
+nerdctl build --platform=amd64,arm64 -t livingdocs/postgres:18.0-upgrade -f Dockerfile.upgrade .
 
-lima nerdctl push --all-platforms livingdocs/postgres:17.2
-lima nerdctl push --all-platforms livingdocs/postgres:17.2-upgrade
+lima nerdctl push --all-platforms livingdocs/postgres:18.0
+lima nerdctl push --all-platforms livingdocs/postgres:18.0-upgrade
 ```
 
 ## Set up streaming replication
 
 ### Simple setup
 ```bash
 # Create the containers
-docker run -d -p 5433:5432 --name postgres-1 livingdocs/postgres:17.2
-docker run -d -p 5434:5432 --name postgres-2 livingdocs/postgres:17.2 standby -d "host=host.docker.internal port=5433 user=postgres target_session_attrs=read-write"
+docker run -d -p 5433:5432 --name postgres-1 livingdocs/postgres:18.0
+docker run -d -p 5434:5432 --name postgres-2 livingdocs/postgres:18.0 standby -d "host=host.docker.internal port=5433 user=postgres target_session_attrs=read-write"
 
 # Test the replication
 docker exec postgres-1 psql -c "CREATE TABLE hello (value text); INSERT INTO hello(value) VALUES('world');"
@@ -77,7 +76,7 @@ docker exec postgres-2 psql -c "SELECT * FROM hello;"
 docker network create local
 
 # First create the database primary
-docker run -d -p 5433:5432 --name postgres-1 --network=local --network-alias=postgres -e POSTGRES_HOST_AUTH_METHOD=md5 livingdocs/postgres:17.2
+docker run -d -p 5433:5432 --name postgres-1 --network=local --network-alias=postgres -e POSTGRES_HOST_AUTH_METHOD=md5 livingdocs/postgres:18.0
 
 # Create the users on database intialization
 # You could also mount an sql or script into /var/lib/postgresql/initdb.d during cluster startup to execute the script automatically.
@@ -86,8 +85,8 @@ docker exec postgres-1 psql -c "CREATE USER replication REPLICATION LOGIN ENCRYP
 
 # The launch the replicas
 export DB_URL="host=postgres port=5432 user=replication password=some-replication-password target_session_attrs=read-write"
-docker run -d -p 5434:5432 --name postgres-2 --network=local --network-alias=postgres livingdocs/postgres:17.2 standby -d $DB_URL
-docker run -d -p 5435:5432 --name postgres-3 --network=local --network-alias=postgres livingdocs/postgres:17.2 standby -d $DB_URL
+docker run -d -p 5434:5432 --name postgres-2 --network=local --network-alias=postgres livingdocs/postgres:18.0 standby -d $DB_URL
+docker run -d -p 5435:5432 --name postgres-3 --network=local --network-alias=postgres livingdocs/postgres:18.0 standby -d $DB_URL
 
 # Test the replication
 docker exec postgres-1 psql -c "CREATE TABLE hello (value text); INSERT INTO hello(value) VALUES('hello');"

scripts/postgres-install

@@ -13,21 +13,18 @@ chown -R postgres:postgres /var/lib/postgresql /var/run/postgresql
 apt-get install -y --no-install-recommends curl nano pspg procps gosu dnsutils gnupg git ca-certificates
 
 >&2 echo "Install Postgres"
-echo "deb http://apt.postgresql.org/pub/repos/apt bookworm-pgdg main 17" > /etc/apt/sources.list.d/pgdg.list
+echo "deb http://apt.postgresql.org/pub/repos/apt bookworm-pgdg main 18" > /etc/apt/sources.list.d/pgdg.list
 curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/pgdg.gpg
 
 apt-get update
 apt-get install -y --no-install-recommends postgresql-common
 sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf
-apt-get install -y --no-install-recommends "postgresql-17=17.2-1.pgdg120+1"
-
->&2 echo 'Install pg_auto_failover'
-apt-get install -y --no-install-recommends pg-auto-failover-cli postgresql-17-auto-failover
+apt-get install -y --no-install-recommends "postgresql-18"
 
 >&2 echo 'Install wal-g'
 archfile=wal-g-fdb-ubuntu-20.04-amd64
 if [ "$(uname -m)" == "aarch64" ]; then archfile=wal-g-fdb-ubuntu20.04-aarch64; fi
-curl -s -L "https://github.com/wal-g/wal-g/releases/download/v3.0.3/$archfile" > /usr/local/bin/wal-g
+curl -s -L "https://github.com/wal-g/wal-g/releases/download/v3.0.7/$archfile" > /usr/local/bin/wal-g
 chmod +x /usr/local/bin/wal-g
 # We need to have locales enabled for postgres
 grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker || sed -ri '/\/usr\/share\/locale/d' /etc/dpkg/dpkg.cfg.d/docker

scripts/upgrade

@@ -59,10 +59,12 @@ if [ -d "$PGDATANEW" ]; then
 fi
 
 if [ "$(id -u)" != "1000" ] ; then
+	gosu postgres:postgres $PGBINOLD/pg_checksums -e
 	PGDATA="$PGDATANEW" gosu postgres:postgres $PGBINNEW/initdb
 	PGDATA="$PGDATANEW" gosu postgres:postgres /scripts/tuneconfig
 	gosu postgres:postgres pg_upgrade --link -j $(getconf _NPROCESSORS_ONLN)
 else
+	$PGBINOLD/pg_checksums -e
 	PGDATA="$PGDATANEW" $PGBINNEW/initdb
 	PGDATA="$PGDATANEW" /scripts/tuneconfig
 	pg_upgrade --link -j $(getconf _NPROCESSORS_ONLN)