From 1e9fad40b353cc894e2e90d54757855548aa8cb0 Mon Sep 17 00:00:00 2001 From: Rex White Date: Fri, 28 Jun 2024 14:13:24 -0400 Subject: [PATCH] RHINENG-10424: More docker-compose pr_check shenanigans --- build/docker-compose-unit_test.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/build/docker-compose-unit_test.yml b/build/docker-compose-unit_test.yml index 4f51126..9209bdf 100644 --- a/build/docker-compose-unit_test.yml +++ b/build/docker-compose-unit_test.yml @@ -6,9 +6,7 @@ services: context: ../ dockerfile: build/Dockerfile target: test - command: sh -c "npm run test:ci && chmod -fR 777 artifacts" - volumes: - - ../artifacts:/opt/app-root/src/artifacts + command: sh -c "npm run test:ci" depends_on: db: condition: service_healthy @@ -29,8 +27,9 @@ services: - POSTGRESQL_PASSWORD=remediations - POSTGRESQL_DATABASE=remediations healthcheck: - test: "psql -c 'SELECT datname FROM pg_database;'" - start_period: 3s + test: [ "CMD-SHELL", "pg_isready" ] interval: 10s + timeout: 5s + start_period: 15s retries: 6