From 7685e1ac20ea4d4a16328668b8db2beb7c189e4d Mon Sep 17 00:00:00 2001 From: Cassowary Date: Wed, 8 Jan 2025 14:54:54 -0800 Subject: [PATCH] Revert "Introduce automatic postgres upgrading" This reverts commit ebfe1d007b5b0afb18dcc6043c470bbfdc467084. --- abra.sh | 1 - compose.yml | 9 -------- entrypoint.postgres.sh.tmpl | 44 ------------------------------------- release/3.2.0+v4.0.1 | 1 - 4 files changed, 55 deletions(-) delete mode 100644 entrypoint.postgres.sh.tmpl delete mode 100644 release/3.2.0+v4.0.1 diff --git a/abra.sh b/abra.sh index 862d024..4a92e3c 100644 --- a/abra.sh +++ b/abra.sh @@ -1,3 +1,2 @@ export CONFIG_TOML_VERSION=v1 export APP_ENTRYPOINT_VERSION=v1 -export DB_ENTRYPOINT_VERSION=v2 diff --git a/compose.yml b/compose.yml index 506be3b..a27e8bc 100644 --- a/compose.yml +++ b/compose.yml @@ -45,11 +45,6 @@ services: - POSTGRES_PASSWORD_FILE=/run/secrets/db_password - POSTGRES_USER=listmonk - POSTGRES_DB=listmonk - configs: - - source: db_entrypoint - target: /docker-entrypoint.sh - mode: 0555 - entrypoint: /docker-entrypoint.sh healthcheck: test: ["CMD-SHELL", "pg_isready -U listmonk"] interval: 10s @@ -79,10 +74,6 @@ configs: app_entrypoint: name: ${STACK_NAME}_app_entrypoint_${APP_ENTRYPOINT_VERSION} file: docker-entrypoint.sh - db_entrypoint: - name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION} - file: entrypoint.postgres.sh.tmpl - template_driver: golang networks: internal: diff --git a/entrypoint.postgres.sh.tmpl b/entrypoint.postgres.sh.tmpl deleted file mode 100644 index 8ecc4fe..0000000 --- a/entrypoint.postgres.sh.tmpl +++ /dev/null @@ -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 diff --git a/release/3.2.0+v4.0.1 b/release/3.2.0+v4.0.1 deleted file mode 100644 index bd4aca6..0000000 --- a/release/3.2.0+v4.0.1 +++ /dev/null @@ -1 +0,0 @@ -Note! This release introduces a postgres version bump. Make sure to undeploy and redeploy instead of updating in place to allow the postgres migration to occur.