From 89f7dc75b7e6d94f66a14ada0106c8d6a0aae840 Mon Sep 17 00:00:00 2001 From: Aviad Hahami Date: Sun, 9 Feb 2025 12:30:58 +0200 Subject: [PATCH] fix: ci now installs docker-compose --- .github/workflows/lint-and-test.yaml | 8 ++++++-- docker-compose.yml | 9 +++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-and-test.yaml b/.github/workflows/lint-and-test.yaml index 8ae8e97..0a89c27 100644 --- a/.github/workflows/lint-and-test.yaml +++ b/.github/workflows/lint-and-test.yaml @@ -33,16 +33,20 @@ jobs: env: NODE_VERSION: ${{ matrix.node_version }} steps: + - name: Install docker-compose + run: | + sudo apt-get update + sudo apt-get install -y docker-compose - uses: actions/checkout@v3 with: # Fetch all history for all tags and branches fetch-depth: 0 - name: Build the stack - run: docker-compose up -d + run: docker-compose -f docker-compose.yml up -d - name: Build testing container run: docker build -t tests:${{ github.sha }} --build-arg SET_NODE_VERSION=$NODE_VERSION . - name: Invoke testing container - run: docker run --network container:vault + run: docker run --network vault-network -e VAULT_ADDR=$VAULT_ADDR -v $PWD/coverage:/app/coverage tests:${{ github.sha }} "cd /app && npm run coverage" env: diff --git a/docker-compose.yml b/docker-compose.yml index ba3c7d1..f1e2458 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,8 @@ services: - "8200:8200" depends_on: - postgres + networks: + - vault-network postgres: image: postgres:15.3 @@ -21,3 +23,10 @@ services: environment: POSTGRES_USER: root POSTGRES_PASSWORD: test + networks: + - vault-network + +networks: + vault-network: + name: vault-network + driver: bridge