diff --git a/scripts/diff.sh b/scripts/diff.sh index d95e793..ce50cdf 100755 --- a/scripts/diff.sh +++ b/scripts/diff.sh @@ -35,8 +35,16 @@ if [[ ! -f "$migration" ]]; then ./scripts/build.sh base "$base" 1>&2 || (echo "base failed to build" && exit 1) ./scripts/build.sh head "$head" 1>&2 || (echo "head failed to build" && exit 1) + local waited=0 until pg_isready --quiet --username "$POSTGRES_USER" -p 5432 && \ - pg_isready --quiet --username "$POSTGRES_USER" -p 5433; do true; done; + pg_isready --quiet --username "$POSTGRES_USER" -p 5433; do + if [[ "$waited" = 10 ]]; then + docker compose logs + exit 1 + fi + waited=$(($waited + 1)); + sleep 1; + done; migra --unsafe "$(db 5432)" "$(db 5433)" || echo "migra exited with code $?. this is /probably/ fine" 1>&2 else