From 5e3e8a655b84e0d65f9893df520d3e34d0f2bcd7 Mon Sep 17 00:00:00 2001
From: iexos <hritter@posteo.de>
Date: Thu, 15 Jun 2023 16:04:05 +0200
Subject: [PATCH 1/3] use postgres 15 and add entrypoint.sh for pg_upgrade

---
 abra.sh                     |  1 +
 compose.yml                 | 11 +++++++++-
 entrypoint.postgres.sh.tmpl | 40 +++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 entrypoint.postgres.sh.tmpl

diff --git a/abra.sh b/abra.sh
index 676938b..d5c7afc 100644
--- a/abra.sh
+++ b/abra.sh
@@ -1,4 +1,5 @@
 export APP_ENTRYPOINT_VERSION=v6
+export DB_ENTRYPOINT_VERSION=v1
 
 migrate() {
 	export DATABASE_PASSWORD=$(cat /run/secrets/db_password)
diff --git a/compose.yml b/compose.yml
index a69be96..e59eb3c 100644
--- a/compose.yml
+++ b/compose.yml
@@ -55,17 +55,22 @@ services:
       - backend
 
   db:
-    image: postgres:11
+    image: postgres:15.3
     networks:
       - backend
     secrets:
       - db_password
+    configs:
+      - source: db_entrypoint
+        target: /docker-entrypoint.sh
+        mode: 0555
     environment:
       POSTGRES_DB: outline
       POSTGRES_PASSWORD_FILE: /run/secrets/db_password
       POSTGRES_USER: outline
     volumes:
       - "postgres_data:/var/lib/postgresql/data"
+    entrypoint: /docker-entrypoint.sh
     deploy:
       labels:
         backupbot.backup: "true"
@@ -100,3 +105,7 @@ configs:
     name: ${STACK_NAME}_app_entrypoint_${APP_ENTRYPOINT_VERSION}
     file: entrypoint.sh.tmpl
     template_driver: golang
+  db_entrypoint:
+    name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION}
+    file: entrypoint.postgres.sh.tmpl
+    template_driver: golang
diff --git a/entrypoint.postgres.sh.tmpl b/entrypoint.postgres.sh.tmpl
new file mode 100644
index 0000000..da27aa8
--- /dev/null
+++ b/entrypoint.postgres.sh.tmpl
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+MIGRATION_MARKER=$PGDATA/migration_in_progress
+OLDDATA=$PGDATA/old_data
+NEWDATA=$PGDATA/new_data
+
+if [ -e $MIGRATION_MARKER ]; then
+  echo "FATAL: previous migration not completed. manual restore necessary"
+  exit 1
+fi
+
+DATA_VERSION=$(cat $PGDATA/PG_VERSION)
+
+if [ -n "$DATA_VERSION" -a "$PG_MAJOR" != "$DATA_VERSION" ]; then
+  echo "postgres data version $DATA_VERSION found, but need $PG_MAJOR. Starting migration"
+  echo "Installing postgres $DATA_VERSION"
+  sed -i "s/$/ $DATA_VERSION/" /etc/apt/sources.list.d/pgdg.list
+  apt-get update && apt-get install -y --no-install-recommends \
+    postgresql-$DATA_VERSION \
+    && rm -rf /var/lib/apt/lists/*
+  echo "shuffling around"
+  gosu postgres mkdir $OLDDATA $NEWDATA
+  chmod 700 $OLDDATA $NEWDATA
+  mv $PGDATA/* $OLDDATA/
+  touch $MIGRATION_MARKER
+  echo "running initdb"
+  # abuse entrypoint script for initdb by making server error out
+  gosu postgres bash -c "export PGDATA=$NEWDATA ; /usr/local/bin/docker-entrypoint.sh --invalid-arg"
+  echo "running pg_upgrade"
+  cd /tmp
+  gosu postgres pg_upgrade --link -b /usr/lib/postgresql/$DATA_VERSION/bin -d $OLDDATA -D $NEWDATA -U $POSTGRES_USER
+  cp $OLDDATA/pg_hba.conf $NEWDATA/
+  mv $NEWDATA/* $PGDATA
+  rm -rf $OLDDATA
+  rmdir $NEWDATA
+  rm $MIGRATION_MARKER
+  echo "migration complete"
+fi
+
+/usr/local/bin/docker-entrypoint.sh postgres

From e0cc0ff9aff785294ae83d1e2e59f9cd14962be3 Mon Sep 17 00:00:00 2001
From: iexos <hritter@posteo.de>
Date: Thu, 15 Jun 2023 18:51:28 +0200
Subject: [PATCH 2/3] make pg upgrade more safe

---
 entrypoint.postgres.sh.tmpl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/entrypoint.postgres.sh.tmpl b/entrypoint.postgres.sh.tmpl
index da27aa8..8289575 100644
--- a/entrypoint.postgres.sh.tmpl
+++ b/entrypoint.postgres.sh.tmpl
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 MIGRATION_MARKER=$PGDATA/migration_in_progress
 OLDDATA=$PGDATA/old_data
 NEWDATA=$PGDATA/new_data
@@ -21,7 +23,7 @@ if [ -n "$DATA_VERSION" -a "$PG_MAJOR" != "$DATA_VERSION" ]; then
   echo "shuffling around"
   gosu postgres mkdir $OLDDATA $NEWDATA
   chmod 700 $OLDDATA $NEWDATA
-  mv $PGDATA/* $OLDDATA/
+  mv $PGDATA/* $OLDDATA/ || true
   touch $MIGRATION_MARKER
   echo "running initdb"
   # abuse entrypoint script for initdb by making server error out

From 53913b92cdfb644ab206d63c4ff2e32ec77581ff Mon Sep 17 00:00:00 2001
From: iexos <hritter@posteo.de>
Date: Sun, 18 Jun 2023 23:03:53 +0200
Subject: [PATCH 3/3] pg_upgrade: catch intentionally failing cmd

---
 entrypoint.postgres.sh.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/entrypoint.postgres.sh.tmpl b/entrypoint.postgres.sh.tmpl
index 8289575..8260e50 100644
--- a/entrypoint.postgres.sh.tmpl
+++ b/entrypoint.postgres.sh.tmpl
@@ -7,7 +7,7 @@ OLDDATA=$PGDATA/old_data
 NEWDATA=$PGDATA/new_data
 
 if [ -e $MIGRATION_MARKER ]; then
-  echo "FATAL: previous migration not completed. manual restore necessary"
+  echo "FATAL: migration was started but did not complete in a previous run. manual recovery necessary"
   exit 1
 fi
 
@@ -27,7 +27,7 @@ if [ -n "$DATA_VERSION" -a "$PG_MAJOR" != "$DATA_VERSION" ]; then
   touch $MIGRATION_MARKER
   echo "running initdb"
   # abuse entrypoint script for initdb by making server error out
-  gosu postgres bash -c "export PGDATA=$NEWDATA ; /usr/local/bin/docker-entrypoint.sh --invalid-arg"
+  gosu postgres bash -c "export PGDATA=$NEWDATA ; /usr/local/bin/docker-entrypoint.sh --invalid-arg || true"
   echo "running pg_upgrade"
   cd /tmp
   gosu postgres pg_upgrade --link -b /usr/lib/postgresql/$DATA_VERSION/bin -d $OLDDATA -D $NEWDATA -U $POSTGRES_USER