From 5521049c2773fae413f7ef2e9f8bfff2e40ef8ef Mon Sep 17 00:00:00 2001 From: Orion Kindel Date: Wed, 19 Jul 2023 21:02:24 -0500 Subject: [PATCH] fix: gen-migrations workflow --- docker-compose.yml | 4 ++-- scripts/build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 25cbe2a..d81eae8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: image: 'postgres:15.3-bullseye' env_file: ['./.env.schema'] volumes: ['/var/run/postgresql:/var/run/postgresql'] - command: '-h localhost -p 5432' + command: '-p 5432' head: container_name: 'head' network_mode: 'host' @@ -15,4 +15,4 @@ services: restart: 'always' env_file: ['./.env.schema'] volumes: ['/var/run/postgresql:/var/run/postgresql'] - command: '-h localhost -p 5433' + command: '-p 5433' diff --git a/scripts/build.sh b/scripts/build.sh index 251f8e0..4d6656a 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -21,7 +21,7 @@ db() { } isready() { - until psql $(db postgres) -c "select 1"; do true; done; + until psql $(db postgres) -c "select 1" &>/dev/null; do true; done; } initdb() { @@ -32,7 +32,7 @@ initdb() { } if [[ "$rev" = "empty" ]]; then - docker compose up -d "$base_or_head" 1>/dev/null + docker compose up -d "$base_or_head" isready initdb exit 0