diff --git a/.drone.yml b/.drone.yml index c4bb821..83e3108 100644 --- a/.drone.yml +++ b/.drone.yml @@ -20,7 +20,8 @@ steps: - name: back-end test (PostgreSQL) image: node commands: - - /bin/bash -c "POSTGRES_USER=mudbase POSTGRES_DATABASE=mudbase POSTGRES_DB=mudbase cd /drone/src/server && ./test/test.sh --postgres --start-postgres-testcontainer" + - /bin/bash -c "POSTGRES_USER=mudbase POSTGRES_DATABASE=mudbase POSTGRES_DB=mudbase \ + cd /drone/src/server && ./test/test.sh --postgres --start-postgres-testcontainer" # --- # kind: pipeline diff --git a/server/test/test.sh b/server/test/test.sh index e088401..7c2cca6 100755 --- a/server/test/test.sh +++ b/server/test/test.sh @@ -83,13 +83,13 @@ if [ ! -z "${DO_POSTGRES}" ]; then done elif [ ! -z "${START_POSTGRES_TESTCONTAINER}" ]; then # Fire up a test Postgres process. - docker_entrypoint.sh postgres & + /docker_entrypoint.sh postgres & PID=$(echo $!) trap "kill $PID" EXIT # Wait for postgres to be ready. while true; do - pg_isready -d mudbase -h localhost -p 5432 -U mudbase + /usr/bin/pg_isready -d mudbase -h localhost -p 5432 -U mudbase [ "$(echo $?)" == "0" ] && break sleep 1 done