Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/babel/traverse-7.23.2
Browse files Browse the repository at this point in the history
  • Loading branch information
aviadhahami authored Feb 9, 2025
2 parents ca5024d + 89f7dc7 commit 351790c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/lint-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 9 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ services:
- "8200:8200"
depends_on:
- postgres
networks:
- vault-network

postgres:
image: postgres:15.3
Expand All @@ -21,3 +23,10 @@ services:
environment:
POSTGRES_USER: root
POSTGRES_PASSWORD: test
networks:
- vault-network

networks:
vault-network:
name: vault-network
driver: bridge

0 comments on commit 351790c

Please sign in to comment.