From edeef4c30a74ec67e383941a60cf7e8c5378bbea Mon Sep 17 00:00:00 2001 From: Matias Garcia Isaia Date: Wed, 6 Mar 2024 15:46:52 -0300 Subject: [PATCH] Use CI-specific docker-compose in Github Actions --- .github/workflows/build.yml | 2 ++ docker-compose.ci.yml | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c27269c4c..a679650e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,7 @@ jobs: - name: Test internal connectivity run: | + cp docker-compose.ci.yml docker-compose.override.yml docker compose up --wait db docker compose run --rm -e PGPASSWORD="${POSTGRES_PASSWORD}" db psql --host db --username planwise --list || true timeout 60s sh -c "while ! nc -z $(docker inspect planwise-db-1 | jq -r '.[0].NetworkSettings.Networks.planwise_default.IPAddress') 5432; do sleep 1; done" || true @@ -21,6 +22,7 @@ jobs: - name: Set environment up run: | + mv docker-compose.ci.yml docker-compose.override.yml docker compose pull docker compose build docker compose run --rm client npm install diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml index 20ded0b44..b0f85422d 100644 --- a/docker-compose.ci.yml +++ b/docker-compose.ci.yml @@ -2,9 +2,6 @@ version: '2' services: app: - volumes: - - .:/app - - ~/cache/.m2:/root/.m2 environment: DATABASE_URL: "jdbc:postgresql://db/planwise?user=postgres&password=planwise" TEST_DATABASE_URL: "jdbc:postgresql://db/planwise-test?user=postgres&password=planwise"