From 1c8ac7563e3e40b118cdd6ac479308a140b49505 Mon Sep 17 00:00:00 2001
From: sbriat <sylvain.briat@free.fr>
Date: Thu, 9 Feb 2023 17:27:21 +0100
Subject: [PATCH] improve ci --check

---
 .gitlab-ci.yml                                |  3 ++-
 docker-compose.ci.service.yml                 | 19 +++++++++++++++++++
 ...pose.ci.yml => docker-compose.ci.tools.yml | 15 ---------------
 3 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 docker-compose.ci.service.yml
 rename docker-compose.ci.yml => docker-compose.ci.tools.yml (65%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 04662d2..b4607ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
diff --git a/docker-compose.ci.service.yml b/docker-compose.ci.service.yml
new file mode 100644
index 0000000..6652025
--- /dev/null
+++ b/docker-compose.ci.service.yml
@@ -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
diff --git a/docker-compose.ci.yml b/docker-compose.ci.tools.yml
similarity index 65%
rename from docker-compose.ci.yml
rename to docker-compose.ci.tools.yml
index 2e41f0c..dbd9988 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.tools.yml
@@ -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}