From 852fc61e2f90f572268ca64b2f6668e8d6053431 Mon Sep 17 00:00:00 2001 From: Ivan Nikolaev-Axenov Date: Thu, 30 May 2024 11:37:31 +0300 Subject: [PATCH] .gitlab-ci.yml updated v2 --- .gitlab-ci.yml | 3 +-- clr_test/docker-compose.yml | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a7257224..fa5e80964 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,5 +26,4 @@ test: stage: test script: - cd clr_test - - docker compose build - - docker compose up --abort-on-container-exit --exit-code-from clearing_system + - docker compose up --build --abort-on-container-exit --exit-code-from clearing_system diff --git a/clr_test/docker-compose.yml b/clr_test/docker-compose.yml index 67ddeabfa..0cb104b89 100644 --- a/clr_test/docker-compose.yml +++ b/clr_test/docker-compose.yml @@ -13,9 +13,7 @@ services: ports: - "5433:5432" volumes: - - ./clearing-all/db/DDL.sql:/docker-entrypoint-initdb.d/1-schema.sql - - ./clearing-all/db/export.sql:/docker-entrypoint-initdb.d/data.sql - - ./clearing-all/db/test-data.sql:/docker-entrypoint-initdb.d/test-data.sql + - ./clearing-all/db:/docker-entrypoint-initdb.d healthcheck: test: ["CMD-SHELL", "pg_isready -U clearing -h db -p 5432 -d clearing"] interval: 5s