Merge branch 'updateCompose' into 'main'

clean compose

See merge request v3/service/territory!7

.gitlab-ci.yml

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

ci/.env.ci

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

docker-compose.ci.service.yml

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

docker-compose.ci.tools.yml

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

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.8'
 
 services:
-  api:
+  v3-territory-api:
     container_name: v3-territory
     build:
       dockerfile: Dockerfile
@@ -21,7 +21,7 @@ services:
         aliases:
           - v3-territory-api
 
-  redis:
+  v3-territory-redis:
     container_name: v3-territory-redis
     image: ${REDIS_IMAGE}
     ports:
@@ -35,7 +35,7 @@ services:
         aliases:
           - v3-territory-redis
 
-  db:
+  v3-territory-db:
     container_name: v3-territory-db
     image: ${POSTGRES_IMAGE}
     environment:
@@ -51,7 +51,7 @@ services:
         aliases:
           - v3-territory-db
 
-  db-test:
+  v3-territory-db-test:
     container_name: v3-territory-db-test
     image: ${POSTGRES_IMAGE}
     environment:

package.json

@@ -21,8 +21,8 @@
     "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:e2e": "jest --config ./test/jest-e2e.json",
-    "generate": "docker exec v3-territory sh -c 'npx prisma generate'",
+    "generate": "docker exec v3-territory-api sh -c 'npx prisma generate'",
-    "migrate": "docker exec v3-territory sh -c 'npx prisma migrate dev'",
+    "migrate": "docker exec v3-territory-api sh -c 'npx prisma migrate dev'",
     "migrate:test": "dotenv -e .env.test -- npx prisma migrate deploy",
     "migrate:test:ci": "dotenv -e ci/.env.ci -- npx prisma migrate deploy"
   },