From 808d5b66dd5cbc8f47d08e33f2aa47d54005a604 Mon Sep 17 00:00:00 2001 From: Justin Clift Date: Thu, 3 Oct 2024 18:42:56 +1000 Subject: [PATCH] Adjust placement of --remove-orphans docker compose option --- test.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test.sh b/test.sh index 0463b04..71bf453 100755 --- a/test.sh +++ b/test.sh @@ -52,7 +52,7 @@ test_run() { fi # Shut down any containers that are still running - docker compose -f docker-compose-pgauto.yml down + docker compose -f docker-compose-pgauto.yml down --remove-orphans ## ## Tests for one shot mode @@ -63,11 +63,10 @@ test_run() { sudo rm -rf postgres-data # Create the PostgreSQL database using a specific version of PostgreSQL - docker compose -f "docker-compose-pg${VERSION}.yml" run --rm --remove-orphans server create_db + docker compose -f "docker-compose-pg${VERSION}.yml" run --rm server create_db # Run the PostgreSQL container in one shot mode - TARGET_TAG="${TARGET}-${FLAVOR}" docker compose -f docker-compose-pgauto.yml run --rm --remove-orphans \ - -e PGAUTO_ONESHOT=yes postgres + TARGET_TAG="${TARGET}-${FLAVOR}" docker compose -f docker-compose-pgauto.yml run --rm -e PGAUTO_ONESHOT=yes postgres # Verify the PostgreSQL data files are now the target version PGVER=$(sudo cat postgres-data/PG_VERSION)