feat: Upgrade to postgres 15

Remove pg_squeeze as it causes issues during upgrades

Author: marcbachmann

Dockerfile

@@ -20,43 +20,39 @@ RUN set -e \
   # Alias gosu as the scripts are still used for alpine linux
   ln -s /usr/sbin/gosu /usr/sbin/su-exec && \
   >&2 echo "Install Postgres" && \
-  sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main 14" > /etc/apt/sources.list.d/pgdg.list' && \
+  sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main 15" > /etc/apt/sources.list.d/pgdg.list' && \
   sh -c 'curl -s https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -' && \
   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-14=14.5-1.pgdg110+1" && \
+	apt-get install -y --no-install-recommends "postgresql-15=15.0-1.pgdg110+1" && \
   >&2 echo 'Install pg_auto_failover' && \
-  apt-get install -y pg-auto-failover-cli postgresql-14-auto-failover && \
+  apt-get install -y pg-auto-failover-cli postgresql-15-auto-failover && \
   >&2 echo 'Install wal-g' && \
-  curl -s -L https://github.com/wal-g/wal-g/releases/download/v2.0.0/wal-g-pg-ubuntu-18.04-amd64 > /usr/local/bin/wal-g && \
+  curl -s -L https://github.com/wal-g/wal-g/releases/download/v2.0.1/wal-g-pg-ubuntu-18.04-amd64 > /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 && \
   ! grep -q '/usr/share/locale' /etc/dpkg/dpkg.cfg.d/docker && \
 	apt-get update; apt-get install -y --no-install-recommends locales && \
 	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \
-  >&2 echo "Install pg_squeeze" && \
-  apt-get install -y postgresql-server-dev-14 build-essential && \
-  git clone https://github.com/cybertec-postgresql/pg_squeeze.git /tmp/pg_squeeze && \
-  cd /tmp/pg_squeeze && git checkout REL1_4 && make && make install && \
   >&2 echo "Cleanup" && \
-  apt-get purge -y --auto-remove apt-transport-https gnupg git postgresql-server-dev-14 build-essential && \
+  apt-get purge -y --auto-remove apt-transport-https gnupg git postgresql-server-dev-15 build-essential && \
   apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/log/*
 
 USER postgres
-ENV PG_MAJOR=14
+ENV PG_MAJOR=15
 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/14/bin:/scripts"
+ENV PATH="$PATH:/usr/lib/postgresql/15/bin:/scripts"
 ENV WALG_CONFIG_FILE=/var/lib/postgresql/.walg.json
 ENV LANG en_US.utf8
 
-COPY --from=postgres:14 /usr/local/bin/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+COPY --from=postgres:15 /usr/local/bin/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 ADD ./scripts /scripts
 
 STOPSIGNAL SIGINT

Dockerfile.upgrade

@@ -1,15 +1,10 @@
-FROM livingdocs/postgres:14.5
+FROM livingdocs/postgres:15.0
 USER root
 RUN set -e \
   export DEBIAN_FRONTEND=noninteractive && \
-  apt-get update && apt-get install -y git build-essential postgresql-9.6 postgresql-11 postgresql-12 postgresql-13 postgresql-server-dev-12 postgresql-server-dev-13  && \
-  # Install pg_squeeze
-  git clone https://github.com/cybertec-postgresql/pg_squeeze.git /tmp/pg_squeeze && \
-  cd /tmp/pg_squeeze && git checkout REL1_4 && \
-  export PATH="/usr/lib/postgresql/12/bin:$PATH" && make && make install && \
-  export PATH="/usr/lib/postgresql/13/bin:$PATH" && make && make install && \
+  apt-get update && apt-get install -y git build-essential postgresql-9.6 postgresql-11 postgresql-12 postgresql-13 postgresql-14  && \
   # Cleanup
-  apt-get purge -y --auto-remove apt-transport-https git postgresql-server-dev-12 postgresql-server-dev-13 build-essential && \
+  apt-get purge -y --auto-remove apt-transport-https git postgresql-server-dev-12 postgresql-server-dev-13 postgresql-server-dev-14 build-essential && \
   apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/log/*
 
 STOPSIGNAL SIGINT

README.md

@@ -1,7 +1,7 @@
-# [Postgres 14.5](https://github.com/livingdocsIO/dockerfile-postgres) [![](https://shields.beevelop.com/docker/pulls/livingdocs/postgres.svg?style=flat-square)](https://hub.docker.com/r/livingdocs/postgres)
+# [Postgres 15.0](https://github.com/livingdocsIO/dockerfile-postgres) [![](https://shields.beevelop.com/docker/pulls/livingdocs/postgres.svg?style=flat-square)](https://hub.docker.com/r/livingdocs/postgres)
 
 - Based on Debian
-- Includes `postgres-contrib`, enables the extensions `pg_stat_statements` and `pg_squeeze` by default
+- 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)
@@ -13,40 +13,40 @@
 
 ```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:14.5
+docker run -d  --name postgres -p 5432:5432 -v postgres:/var/lib/postgresql -e POSTGRES_PASSWORD=somepassword livingdocs/postgres:15.0
 ```
 
 ## Upgrade an existing postgres container
 
 ```bash
 # Let's assume you've created a container previously
-docker run -d --name postgres -p 5432:5432 -v postgres:/var/lib/postgresql livingdocs/postgres:13.4
+docker run -d --name postgres -p 5432:5432 -v postgres:/var/lib/postgresql livingdocs/postgres:14.5
 
 # First stop it, then run the upgrade image
 docker stop postgres
-docker run --rm -v postgres:/var/lib/postgresql livingdocs/postgres:14.5-upgrade
+docker run --rm -v postgres:/var/lib/postgresql livingdocs/postgres:15.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:14.5
+docker run -d --name postgres -p 5432:5432 -v postgres:/var/lib/postgresql livingdocs/postgres:15.0
 ```
 
 ## To build this image manually
 
 ```bash
-docker build -t livingdocs/postgres:14.5 .
+docker build -t livingdocs/postgres:15.0 .
 
 # To build and push the multi-arch manifest to docker hub
-docker buildx build --platform linux/amd64,linux/arm64 -t livingdocs/postgres:14.5 --push .
-docker buildx build --platform linux/amd64,linux/arm64 -t livingdocs/postgres:14.5-upgrade --push  -f Dockerfile.upgrade .
+docker buildx build --platform linux/amd64,linux/arm64 -t livingdocs/postgres:15.0 --push .
+docker buildx build --platform linux/amd64,linux/arm64 -t livingdocs/postgres:15.0-upgrade --push  -f Dockerfile.upgrade .
 ```
 
 ## Set up streaming replication
 
 ### Simple setup
 ```bash
 # Create the containers
-docker run -d -p 5433:5432 --name postgres-1 livingdocs/postgres:14.5
-docker run -d -p 5434:5432 --name postgres-2 livingdocs/postgres:14.5 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:15.0
+docker run -d -p 5434:5432 --name postgres-2 livingdocs/postgres:15.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');"
@@ -64,7 +64,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:14.5
+docker run -d -p 5433:5432 --name postgres-1 --network=local --network-alias=postgres -e POSTGRES_HOST_AUTH_METHOD=md5 livingdocs/postgres:15.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.
@@ -73,8 +73,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:14.5 standby -d $DB_URL
-docker run -d -p 5435:5432 --name postgres-3 --network=local --network-alias=postgres livingdocs/postgres:14.5 standby -d $DB_URL
+docker run -d -p 5434:5432 --name postgres-2 --network=local --network-alias=postgres livingdocs/postgres:15.0 standby -d $DB_URL
+docker run -d -p 5435:5432 --name postgres-3 --network=local --network-alias=postgres livingdocs/postgres:15.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');"