CitrineOS deployment + FM integration + S2 service + skills (mosaik, NemoMod) + Grafana 17 panels

config/docker-compose-citrineos.yml

@@ -1,6 +1,3 @@
-# Cariflex - CitrineOS docker-compose (adapté pour l'intégration Cariflex)
-# Basé sur https://github.com/citrineos/citrineos-core
-
 version: '3.8'
 
 services:
@@ -23,19 +20,21 @@ services:
     depends_on:
       cariflex-citrineos-db:
         condition: service_healthy
+      cariflex-amqp:
+        condition: service_healthy
     ports:
-      - 8080:8080
-      - 8443:8443
+      - "8081:8080"
     volumes:
       - citrineos-data:/data
     healthcheck:
-      test: ["CMD-SHELL", "node -e \"const net = require('net'); const client = net.createConnection(8080, '127.0.0.1', () => { client.end(); process.exit(0); }); client.on('error', () => process.exit(1)); client.setTimeout(5000, () => { client.destroy(); process.exit(1); });\""]
+      test: ["CMD-SHELL", "node -e \"const net = require('net'); const c = net.createConnection(8080, '127.0.0.1', () => { c.end(); process.exit(0); }); c.on('error', () => process.exit(1));\""]
       interval: 30s
       timeout: 10s
       retries: 5
     networks:
-      - traefik-public
-      - cariflex-internal
+      cariflex-internal:
+        aliases:
+          - citrineos-server
 
   cariflex-citrineos-db:
     image: postgis/postgis:16-3.5
@@ -48,12 +47,14 @@ services:
     volumes:
       - citrineos-db-data:/var/lib/postgresql/data
     healthcheck:
-      test: "pg_isready --username=citrine"
+      test: pg_isready --username=citrine
       interval: 5s
       timeout: 10s
       retries: 5
     networks:
-      - cariflex-internal
+      cariflex-internal:
+        aliases:
+          - citrineos-db
 
   cariflex-amqp:
     image: rabbitmq:3-management
@@ -65,12 +66,16 @@ services:
     volumes:
       - citrineos-amqp-data:/var/lib/rabbitmq
     healthcheck:
-      test: rabbitmq-diagnostics -q check_port_connectivity
-      interval: 10s
+      test: rabbitmq-diagnostics -q ping
+      interval: 15s
       timeout: 10s
-      retries: 3
+      retries: 10
+      start_period: 30s
     networks:
-      - cariflex-internal
+      cariflex-internal:
+        aliases:
+          - amqp-broker
+          - cariflex-amqp
 
 volumes:
   citrineos-data:
@@ -81,7 +86,6 @@ volumes:
     driver: local
 
 networks:
-  traefik-public:
-    external: true
   cariflex-internal:
-    driver: bridge
+    name: config_cariflex-internal
+    external: true