diff --git a/abra.sh b/abra.sh index 9a7b108..e99b1ae 100644 --- a/abra.sh +++ b/abra.sh @@ -2,7 +2,6 @@ export NGINX_CONFIG_VERSION=v4 export APP_ENTRYPOINT_VERSION=v7 -export DB_ENTRYPOINT_VERSION=v1 generate_secret() { abra app secret insert "$APP_NAME" peertube_secret v1 "$(openssl rand -hex 32)" --chaos diff --git a/compose.yml b/compose.yml index f538700..71624a5 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: web: - image: nginx:1.26.0 + image: nginx:1.27.4 networks: - proxy - internal @@ -81,19 +81,14 @@ services: - internal deploy: labels: - - "coop-cloud.${STACK_NAME}.version=4.1.0+v5.2.1-bullseye" + - "coop-cloud.${STACK_NAME}.version=5.0.0+v5.2.1-bullseye" db: - image: postgres:10-alpine - entrypoint: "/docker-entrypoint.upgrade.sh" + image: pgautoupgrade/pgautoupgrade:17-alpine environment: - POSTGRES_USER=peertube - POSTGRES_DB=peertube - POSTGRES_PASSWORD_FILE=/run/secrets/db_password - configs: - - source: db_entrypoint - target: /docker-entrypoint.upgrade.sh - mode: 0555 secrets: - db_password volumes: @@ -141,10 +136,6 @@ 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 secrets: db_password: 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/5.0.0+v5.2.1-bullseye b/release/5.0.0+v5.2.1-bullseye new file mode 100644 index 0000000..0a3aab6 --- /dev/null +++ b/release/5.0.0+v5.2.1-bullseye @@ -0,0 +1 @@ +WARNING! ⚠️ This release includes several major Postgres version updates, please make even more sure to take a database backup than usual \ No newline at end of file