ncaron
/
configuration
mirror of https://gitlab.com/mobicoop/v3/service/configuration.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'updateCompose' into 'main' 

clean compose

See merge request v3/service/configuration!10
This commit is contained in:
Sylvain Briat 2023-02-28 10:03:19 +00:00
parent 66bf139286 b9d6d88a9a
commit bb81c4c7f8
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -19,7 +19,7 @@ test:
- docker-compose -f docker-compose.ci.tools.yml -p configuration-tools --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 - sh ci/wait-up.sh
- docker-compose -f docker-compose.ci.service.yml -p configuration-service --env-file ci/.env.ci up -d - 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" - docker exec -t v3-configuration-api sh -c "npm run test:integration:ci"
coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/ coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/
rules: rules:
- if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_MESSAGE =~ /--check/ || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_MESSAGE =~ /--check/ || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'

4
ci/.env.ci
View File

@ -3,10 +3,10 @@ SERVICE_URL=0.0.0.0
SERVICE_PORT=5003 SERVICE_PORT=5003
# PRISMA # PRISMA
DATABASE_URL="postgresql://configuration:configuration@db:5432/configuration?schema=public" DATABASE_URL="postgresql://configuration:configuration@v3-configuration-db-test:5432/configuration?schema=public"
# RABBIT MQ # RABBIT MQ
RMQ_URI=amqp://broker:5672 RMQ_URI=amqp://v3-configuration-broker:5672
# MESSAGE BROKER # MESSAGE BROKER
BROKER_IMAGE=rabbitmq:3-alpine BROKER_IMAGE=rabbitmq:3-alpine

4
docker-compose.ci.service.yml
View File

@ -1,8 +1,8 @@
version: '3.8' version: '3.8'
services: services:
api: v3-configuration-api:
container_name: v3-configuration container_name: v3-configuration-api
build: build:
dockerfile: ci/Dockerfile dockerfile: ci/Dockerfile
context: . context: .

6
docker-compose.ci.tools.yml
View File

@ -1,7 +1,7 @@
version: '3.8' version: '3.8'
services: services:
db: v3-configuration-db-test:
container_name: v3-configuration-db-test container_name: v3-configuration-db-test
image: ${POSTGRES_IMAGE} image: ${POSTGRES_IMAGE}
environment: environment:
@ -13,8 +13,8 @@ services:
networks: networks:
- v3-network - v3-network
broker: v3-configuration-broker:
container_name: v3-broker container_name: v3-configuration-broker
image: ${BROKER_IMAGE} image: ${BROKER_IMAGE}
ports: ports:
- 5672:5672 - 5672:5672

8
docker-compose.yml
View File

@ -1,8 +1,8 @@
version: '3.8' version: '3.8'
services: services:
api: v3-configuration-api:
container_name: v3-configuration container_name: v3-configuration-api
build: build:
dockerfile: Dockerfile dockerfile: Dockerfile
context: . context: .
@ -21,7 +21,7 @@ services:
aliases: aliases:
- v3-configuration-api - v3-configuration-api
db: v3-configuration-db:
container_name: v3-configuration-db container_name: v3-configuration-db
image: ${POSTGRES_IMAGE} image: ${POSTGRES_IMAGE}
environment: environment:
@ -37,7 +37,7 @@ services:
aliases: aliases:
- v3-configuration-db - v3-configuration-db
db-test: v3-configuration-db-test:
container_name: v3-configuration-db-test container_name: v3-configuration-db-test
image: ${POSTGRES_IMAGE} image: ${POSTGRES_IMAGE}
environment: environment:

4
package.json
View File

@ -21,8 +21,8 @@
"test:integration:ci": "npm run migrate:test:ci && dotenv -e ci/.env.ci -- jest --testPathPattern 'tests/integration/'", "test:integration:ci": "npm run migrate:test:ci && dotenv -e ci/.env.ci -- jest --testPathPattern 'tests/integration/'",
"test:cov": "jest --testPathPattern 'tests/unit/' --coverage", "test:cov": "jest --testPathPattern 'tests/unit/' --coverage",
"test:e2e": "jest --config ./test/jest-e2e.json", "test:e2e": "jest --config ./test/jest-e2e.json",
"generate": "docker exec v3-configuration sh -c 'npx prisma generate'", "generate": "docker exec v3-configuration-api sh -c 'npx prisma generate'",
"migrate": "docker exec v3-configuration sh -c 'npx prisma migrate dev'", "migrate": "docker exec v3-configuration-api sh -c 'npx prisma migrate dev'",
"migrate:test": "dotenv -e .env.test -- npx prisma migrate deploy", "migrate:test": "dotenv -e .env.test -- npx prisma migrate deploy",
"migrate:test:ci": "dotenv -e ci/.env.ci -- npx prisma migrate deploy" "migrate:test:ci": "dotenv -e ci/.env.ci -- npx prisma migrate deploy"
}, },