X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fdocker%2Fdocker-compose.yaml;h=d8866e5b7ff62388ba2f70288c93b50a9096dedc;hb=4088a9bdec94c554fe23e35ac9df482c91241de5;hp=3917c9ee77578b7fa7b09cb37eb6d5930d061ca3;hpb=09a1e974bb70fb9b02a9a0fb41f421fdf7457cbd;p=osm%2Fdevops.git

diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index 3917c9ee..d8866e5b 100644
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -1,14 +1,16 @@
 version: '3'
 volumes:
+  ro:
   ro_db:
   mongo_db:
   mon_db:
+  pol_db:
   osm_packages:
-  keystone_db:
+  prom_db:
 networks:
   netOSM:
     external:
-      name: ${OSM_NETWORK:-netOSM}
+      name: ${OSM_NETWORK:-netosm}
     #driver: overlay
     #driver_opts:
     #  com.docker.network.driver.mtu: "1446"
@@ -34,6 +36,7 @@ services:
       KAFKA_ADVERTISED_HOST_NAME: kafka
       KAFKA_ADVERTISED_PORT: 9092
       KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_LOG_RETENTION_HOURS: 24
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     #depends_on:
@@ -46,28 +49,28 @@ services:
       - netOSM
     volumes:
       - mongo_db:/data/db
-  keystone-db:
-    image: mariadb:10
+  prometheus:
+    image: prom/prometheus:${PROMETHEUS_TAG:-latest}
+    hostname: prometheus
+    ports:
+      - "${OSM_PROM_PORTS:-9091:9090}"
+    volumes:
+      - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
+      - prom_db:/prometheus
     networks:
       - netOSM
-    volumes:
-      - keystone_db:/var/lib/mysql
-    env_file:
-      - ./keystone-db.env
-#    ports:
-#      - "3306:3306"
   keystone:
-    image: osm/keystone:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-5}
     networks:
       - netOSM
     environment:
-      DB_HOST: keystone-db
+      DB_HOST: mysql
     env_file:
       - ./keystone.env
     ports:
       - "${OSM_KEYSTONE_PORTS:-5000:5000}"
   nbi:
-    image: osm/nbi:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-5}
     networks:
       - netOSM
     volumes:
@@ -75,13 +78,15 @@ services:
     environment:
       OSMNBI_DATABASE_HOST: mongo
       OSMNBI_MESSAGE_HOST: kafka
+    env_file:
+      - ./nbi.env
     ports:
       - "${OSM_NBI_PORTS:-9999:9999}"
     #depends_on:
     #  - kafka
     #  - mongo
   lcm:
-    image: osm/lcm:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-5}
     networks:
       - netOSM
     volumes:
@@ -96,10 +101,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:
@@ -107,48 +114,67 @@ services:
 #    ports:
 #      - "3306:3306"
   ro:
-    image: osm/ro:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-5}
     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: osm/mon:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-5}
     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
-    ports:
-      - "8662"
-  pm:
-    image: osm/pm:${TAG:-latest}
+    logging:
+        driver: "json-file"
+        options:
+            max-file: 5
+            max-size: 10m
+  pol:
+    image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-5}
     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: osm/light-ui:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-5}
     networks:
       - netOSM
     environment:
       OSM_SERVER: nbi
     #depends_on:
     #  - nbi
+    env_file:
+      - ./lwui.env
     ports:
       - "${OSM_UI_PORTS:-80:80}"