From 6e367a0e4c6b282f551c66e67689065d7c91d307 Mon Sep 17 00:00:00 2001 From: xbgmsharp Date: Wed, 7 Aug 2024 23:12:12 +0200 Subject: [PATCH] Updat github workflows, docker compose upgrade --- .github/workflows/db-lint.yml | 12 ++++++------ .github/workflows/db-test.yml | 2 +- .github/workflows/frontend-test.yml | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/db-lint.yml b/.github/workflows/db-lint.yml index 9316078..4015f7d 100644 --- a/.github/workflows/db-lint.yml +++ b/.github/workflows/db-lint.yml @@ -27,7 +27,7 @@ jobs: run: cp .env.example .env - name: Pull Docker images - run: docker-compose pull db api + run: docker compose pull db api - name: Run PostgSail Database & schemalint # Environment variables @@ -41,10 +41,10 @@ jobs: run: | set -eu source .env - docker-compose stop || true - docker-compose rm || true - docker-compose up -d db && sleep 30 && docker-compose up -d api && sleep 5 - docker-compose ps -a + docker compose stop || true + docker compose rm || true + docker compose up -d db && sleep 30 && docker compose up -d api && sleep 5 + docker compose ps -a echo ${PGSAIL_API_URL} curl ${PGSAIL_API_URL} npm i -D schemalint @@ -52,4 +52,4 @@ jobs: - name: Show the logs if: always() run: | - docker-compose logs \ No newline at end of file + docker compose logs \ No newline at end of file diff --git a/.github/workflows/db-test.yml b/.github/workflows/db-test.yml index 381e1d7..daf0f8a 100644 --- a/.github/workflows/db-test.yml +++ b/.github/workflows/db-test.yml @@ -51,7 +51,7 @@ jobs: source .env docker compose stop || true docker compose rm || true - docker compose up -d db && sleep 30 && docker-compose up -d api && sleep 5 + docker compose up -d db && sleep 30 && docker compose up -d api && sleep 5 docker compose ps -a echo ${PGSAIL_API_URL} curl ${PGSAIL_API_URL} diff --git a/.github/workflows/frontend-test.yml b/.github/workflows/frontend-test.yml index af982d0..5fe0f04 100644 --- a/.github/workflows/frontend-test.yml +++ b/.github/workflows/frontend-test.yml @@ -49,10 +49,10 @@ jobs: run: | set -eu source .env - docker-compose stop || true - docker-compose rm || true - docker-compose up -d db && sleep 30 && docker-compose up -d api && sleep 5 - docker-compose ps -a + docker compose stop || true + docker compose rm || true + docker compose up -d db && sleep 30 && docker compose up -d api && sleep 5 + docker compose ps -a echo "Test PostgSail Web Unit Test" docker compose -f docker-compose.dev.yml -f docker-compose.yml up -d web_dev && sleep 100 docker compose -f docker-compose.dev.yml -f docker-compose.yml logs web_dev @@ -67,4 +67,4 @@ jobs: - name: Show the logs if: always() run: | - docker-compose logs \ No newline at end of file + docker compose logs \ No newline at end of file