From bed55cd28ac69d807fe2ea30220b8cf3e863c858 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 14 Dec 2024 04:35:20 +0100 Subject: [PATCH] chore: publish 1.4.1+2024.11.0 release --- compose.yml | 5 ++--- entrypoint.postgres.sh.tmpl | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compose.yml b/compose.yml index 7462ed5..39cea91 100644 --- a/compose.yml +++ b/compose.yml @@ -25,7 +25,7 @@ services: - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - - "coop-cloud.${STACK_NAME}.version=1.4.0+2024.11.0" + - "coop-cloud.${STACK_NAME}.version=1.4.1+2024.11.0" healthcheck: test: ["CMD", "curl", "-f", "http://localhost/healthcheck"] interval: 30s @@ -52,8 +52,7 @@ services: - source: db_entrypoint target: /docker-entrypoint.sh mode: 0555 - entrypoint: - /docker-entrypoint.sh + entrypoint: /docker-entrypoint.sh healthcheck: test: ["CMD-SHELL", "[ -f $${HEALTHCHECK_MARKER} ] || pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"] interval: 10s diff --git a/entrypoint.postgres.sh.tmpl b/entrypoint.postgres.sh.tmpl index 826c5d8..b2e4d2f 100644 --- a/entrypoint.postgres.sh.tmpl +++ b/entrypoint.postgres.sh.tmpl @@ -21,6 +21,7 @@ install_old_postgres_debian() { pgenv check LATEST_OLD_VERSION=$(pgenv available $DATA_VERSION | grep -oE "$DATA_VERSION\.[0-9]+" | tail -n 1) pgenv build $LATEST_OLD_VERSION + export PATH="/tmp/pgenv/pgsql-$LATEST_OLD_VERSION/bin:$PATH" } install_old_postgres_alpine() { @@ -34,6 +35,7 @@ install_old_postgres_alpine() { pgenv check LATEST_OLD_VERSION=$(pgenv available $DATA_VERSION | grep -oE "$DATA_VERSION\.[0-9]+" | tail -n 1) pgenv build $LATEST_OLD_VERSION + export PATH="/tmp/pgenv/pgsql-$LATEST_OLD_VERSION/bin:$PATH" } if [ -e $MIGRATION_MARKER ]; then @@ -62,6 +64,7 @@ if [ -f $PGDATA/PG_VERSION ]; then gosu postgres bash -c "export PGDATA=$NEWDATA ; /usr/local/bin/docker-entrypoint.sh --invalid-arg || true" echo "running pg_upgrade" cd /tmp + sleep 5 gosu postgres pg_upgrade --link -b /tmp/pgenv/pgsql-$LATEST_OLD_VERSION/bin -d $OLDDATA -D $NEWDATA -U $POSTGRES_USER cp $OLDDATA/pg_hba.conf $NEWDATA/ mv $NEWDATA/* $PGDATA