Merge branch 'improveCi' into 'main'

improve ci --check

See merge request v3/services/configuration!9
This commit is contained in:
Sylvain Briat 2023-02-09 16:32:43 +00:00
commit 66bf139286
3 changed files with 21 additions and 16 deletions

View File

@ -16,8 +16,9 @@ test:
services:
- docker:dind
script:
- docker-compose -f docker-compose.ci.yml --env-file ci/.env.ci up -d
- docker-compose -f docker-compose.ci.tools.yml -p configuration-tools --env-file ci/.env.ci up -d
- sh ci/wait-up.sh
- docker-compose -f docker-compose.ci.service.yml -p configuration-service --env-file ci/.env.ci up -d
- docker exec -t v3-configuration sh -c "npm run test:integration:ci"
coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/
rules:

View File

@ -0,0 +1,19 @@
version: '3.8'
services:
api:
container_name: v3-configuration
build:
dockerfile: ci/Dockerfile
context: .
env_file:
- ci/.env.ci
ports:
- 5003:5003
networks:
- v3-network
networks:
v3-network:
name: v3-network
external: true

View File

@ -1,21 +1,6 @@
version: '3.8'
services:
api:
container_name: v3-configuration
build:
dockerfile: ci/Dockerfile
context: .
env_file:
- ci/.env.ci
ports:
- 5003:5003
depends_on:
- db
- broker
networks:
- v3-network
db:
container_name: v3-configuration-db-test
image: ${POSTGRES_IMAGE}