feat(db): use pgautoupgrade instead of custom pg_upgrade entrypoint
Some checks failed
cc-ci/testme cc-ci: failure
Some checks failed
cc-ci/testme cc-ci: failure
Replace the hand-rolled entrypoint.postgres.sh.tmpl (which apt-installed the old PG binaries and ran initdb + pg_upgrade --link by hand) with the pgautoupgrade/pgautoupgrade:18-alpine image, matching the other recipes. PGDATA is pinned to the legacy /var/lib/postgresql/data so the existing cluster on the volume is upgraded in place rather than re-initialised. Drops the db_entrypoint config and DB_ENTRYPOINT_VERSION.
This commit is contained in:
1
abra.sh
1
abra.sh
@ -1,4 +1,3 @@
|
|||||||
export CLICKHOUSE_CONF_VERSION=v2
|
export CLICKHOUSE_CONF_VERSION=v2
|
||||||
export CLICKHOUSE_USER_CONF_VERSION=v2
|
export CLICKHOUSE_USER_CONF_VERSION=v2
|
||||||
export DB_ENTRYPOINT_VERSION=v1
|
|
||||||
export CLICKHOUSE_ENTRYPOINT_VERSION=v3
|
export CLICKHOUSE_ENTRYPOINT_VERSION=v3
|
||||||
|
|||||||
19
compose.yml
19
compose.yml
@ -35,21 +35,22 @@ services:
|
|||||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
- coop-cloud.${STACK_NAME}.version=4.0.0+v2.0.0
|
- coop-cloud.${STACK_NAME}.version=4.0.0+v2.0.0
|
||||||
db:
|
db:
|
||||||
image: postgres:14.18
|
image: pgautoupgrade/pgautoupgrade:18-alpine
|
||||||
configs:
|
|
||||||
- source: db_entrypoint
|
|
||||||
target: /docker-entrypoint.sh
|
|
||||||
mode: 0555
|
|
||||||
# Custom docker entrypoint to handle major Postgres version upgrades
|
|
||||||
volumes:
|
volumes:
|
||||||
- db-data:/var/lib/postgresql/data
|
- db-data:/var/lib/postgresql/data
|
||||||
entrypoint: /docker-entrypoint.sh
|
|
||||||
environment:
|
environment:
|
||||||
|
# pin legacy PGDATA so the existing cluster on the volume is upgraded in place, not re-init'd
|
||||||
|
- PGDATA=/var/lib/postgresql/data
|
||||||
- POSTGRES_USER=plausible
|
- POSTGRES_USER=plausible
|
||||||
- POSTGRES_PASSWORD=plausible
|
- POSTGRES_PASSWORD=plausible
|
||||||
- POSTGRES_DB=plausible
|
- POSTGRES_DB=plausible
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U plausible -d plausible"]
|
||||||
|
interval: 5s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 60
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
backupbot.backup: "true"
|
backupbot.backup: "true"
|
||||||
@ -99,10 +100,6 @@ configs:
|
|||||||
clickhouse-user-config:
|
clickhouse-user-config:
|
||||||
name: ${STACK_NAME}_clickhouse_user_config_${CLICKHOUSE_USER_CONF_VERSION}
|
name: ${STACK_NAME}_clickhouse_user_config_${CLICKHOUSE_USER_CONF_VERSION}
|
||||||
file: clickhouse-user-config.xml
|
file: clickhouse-user-config.xml
|
||||||
db_entrypoint:
|
|
||||||
name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION}
|
|
||||||
file: entrypoint.postgres.sh.tmpl
|
|
||||||
template_driver: golang
|
|
||||||
clickhouse_entrypoint:
|
clickhouse_entrypoint:
|
||||||
name: ${STACK_NAME}_clickhouse_entrypoint_${CLICKHOUSE_ENTRYPOINT_VERSION}
|
name: ${STACK_NAME}_clickhouse_entrypoint_${CLICKHOUSE_ENTRYPOINT_VERSION}
|
||||||
file: entrypoint.clickhouse.sh
|
file: entrypoint.clickhouse.sh
|
||||||
|
|||||||
@ -1,44 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
MIGRATION_MARKER=$PGDATA/migration_in_progress
|
|
||||||
OLDDATA=$PGDATA/old_data
|
|
||||||
NEWDATA=$PGDATA/new_data
|
|
||||||
|
|
||||||
if [ -e $MIGRATION_MARKER ]; then
|
|
||||||
echo "FATAL: migration was started but did not complete in a previous run. manual recovery necessary"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -f $PGDATA/PG_VERSION ]; then
|
|
||||||
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/ || 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
|
|
||||||
fi
|
|
||||||
|
|
||||||
/usr/local/bin/docker-entrypoint.sh postgres
|
|
||||||
Reference in New Issue
Block a user