Update to postgres 15 and run pg_upgrade automatically #15

Merged
iexos merged 3 commits from iexos/outline:pg15 into main 2023-06-19 11:32:40 +00:00
3 changed files with 53 additions and 1 deletions

View File

@ -1,4 +1,5 @@
export APP_ENTRYPOINT_VERSION=v6
export DB_ENTRYPOINT_VERSION=v1
migrate() {
export DATABASE_PASSWORD=$(cat /run/secrets/db_password)

View File

@ -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

View File

@ -0,0 +1,42 @@
#!/bin/bash
set -e
MIGRATION_MARKER=$PGDATA/migration_in_progress
OLDDATA=$PGDATA/old_data
NEWDATA=$PGDATA/new_data
decentral1se marked this conversation as resolved
Review

Can we help with a from which version to which we need to handle the manual restore with?

Can we help with a from which version to which we need to handle the manual restore with?
Review

I don't know in which state the migration did not complete, its just a safety mechanism to stop interrupted migrations that are in an unclear state. With restore I mean to restore the hopefully made backup. Does this make it more clear?

I don't know in which state the migration did not complete, its just a safety mechanism to stop interrupted migrations that are in an unclear state. With restore I mean to restore the hopefully made backup. Does this make it more clear?
if [ -e $MIGRATION_MARKER ]; then
echo "FATAL: migration was started but did not complete in a previous run. manual recovery 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/*
decentral1se marked this conversation as resolved
Review

Is gosu definitely already installed? I guess it could be included in the apt-install stuff above to help make it more portable. Just noting this thought in case it's useful.

Is `gosu` definitely already installed? I guess it could be included in the `apt-install` stuff above to help make it more portable. Just noting this thought in case it's useful.
Review

gosu is used in the vendor docker-entrypoint.sh. Its not portable to -alpine, but wouldn't be with apt-install either

`gosu` is used in the vendor `docker-entrypoint.sh`. Its not portable to `-alpine`, but wouldn't be with `apt-install` either
echo "shuffling around"
gosu postgres mkdir $OLDDATA $NEWDATA
chmod 700 $OLDDATA $NEWDATA
mv $PGDATA/* $OLDDATA/ || true
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 || 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
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