X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fdocker%2Fdocker-compose.yaml;h=61aeeeede16ebf5acae87d9852f34ae69beebd0b;hb=336c7e8bbe4b32f44e05a5558bd6c48d1682b4a3;hp=e45fabde25a42b47229c5c142e6abed1d38e9318;hpb=6021624aec365ab77c770b5880f40b4f711624e2;p=osm%2Fdevops.git

diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index e45fabde..61aeeeed 100644
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -1,10 +1,12 @@
 version: '3'
 volumes:
+  ro:
   ro_db:
   mongo_db:
   mon_db:
+  pol_db:
   osm_packages:
-  keystone_db:
+  prom_db:
 networks:
   netOSM:
     external:
@@ -53,30 +55,21 @@ services:
       - "${OSM_PROM_PORTS:-9091:9090}"
     volumes:
       - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
+      - prom_db:/prometheus
     networks:
       - netOSM
-  keystone-db:
-    image: mariadb:10
-    networks:
-      - netOSM
-    volumes:
-      - keystone_db:/var/lib/mysql
-    env_file:
-      - ./keystone-db.env
-#    ports:
-#      - "3306:3306"
   keystone:
-    image: ${DOCKER_USER:-osm}/keystone:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-latest}
     networks:
       - netOSM
     environment:
-      DB_HOST: keystone-db
+      DB_HOST: mysql
     env_file:
       - ./keystone.env
     ports:
       - "${OSM_KEYSTONE_PORTS:-5000:5000}"
   nbi:
-    image: ${DOCKER_USER:-osm}/nbi:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-latest}
     networks:
       - netOSM
     volumes:
@@ -92,7 +85,7 @@ services:
     #  - kafka
     #  - mongo
   lcm:
-    image: ${DOCKER_USER:-osm}/lcm:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-latest}
     networks:
       - netOSM
     volumes:
@@ -107,10 +100,12 @@ services:
     #  - kafka
     #  - mongo
     #  - ro
-  ro-db:
+  mysql:
     image: mysql:5
     networks:
-      - netOSM
+      netOSM:
+        aliases:
+          - ro-db
     volumes:
       - ro_db:/var/lib/mysql
     env_file:
@@ -118,43 +113,60 @@ services:
 #    ports:
 #      - "3306:3306"
   ro:
-    image: ${DOCKER_USER:-osm}/ro:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-latest}
     networks:
       - netOSM
     environment:
-      RO_DB_HOST: ro-db
+      RO_DB_HOST: mysql
     env_file:
       - ./ro.env
     #depends_on:
-    #  - ro-db
+    #  - mysql
+    volumes:
+      - ro:/var/log/osm
     ports:
       - "${OSM_RO_PORTS:-9090:9090}"
   mon:
-    image: ${DOCKER_USER:-osm}/mon:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-latest}
     networks:
       - netOSM
     volumes:
       - mon_db:/app/database
     environment:
-      BROKER_URI: kafka:9092
-      DATABASE: sqlite:///app/database/mon_sqlite.db
+      OSMMON_MESSAGE_HOST: kafka
+      OSMMON_MESSAGE_PORT: 9092
     env_file:
       - ./mon.env
     ports:
       - "${OSM_MON_PORTS:-8662:8662}"
     #depends_on:
     #  - kafka
+    logging:
+        driver: "json-file"
+        options:
+            max-file: 5
+            max-size: 10m
   pol:
-    image: ${DOCKER_USER:-osm}/pol:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-latest}
     networks:
       - netOSM
+    volumes:
+      - pol_db:/app/database
     environment:
-      BROKER_URI: kafka:9092
+      OSMPOL_MESSAGE_HOST: kafka
+      OSMPOL_MESSAGE_PORT: 9092
+    env_file:
+      - ./pol.env
     #depends_on:
     #  - kafka
     #  - mon
+    logging:
+      driver: "json-file"
+      options:
+        max-file: 5
+        max-size: 10m
   light-ui:
-    image: ${DOCKER_USER:-osm}/light-ui:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-latest}
     networks:
       - netOSM
     environment: