X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fdocker%2Fdocker-compose.yaml;h=c325776c668f3060b1c2d6411c3ba393a68a2665;hb=27556780aaf744ac57f2a023f10009230a61316b;hp=5342b305ffed4880aad16b874a60f900bfb4235b;hpb=8cc3a283b46f20b256b2044e505ac03a32fb2113;p=osm%2Fdevops.git

diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index 5342b305..c325776c 100644
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -1,11 +1,29 @@
+##
+# Copyright 2019 ETSI
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+##
+
+########################################################################
+
 version: '3'
 volumes:
+  ro:
   ro_db:
   mongo_db:
   mon_db:
   pol_db:
   osm_packages:
-  keystone_db:
   prom_db:
 networks:
   netOSM:
@@ -36,8 +54,14 @@ 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
+    healthcheck:
+      test: zookeeper-shell.sh zookeeper:2181 ls /brokers/ids 2>&1 | grep "Node does not exist" && exit 1 || exit 0
+      interval: 20s
+      timeout: 10s
+      retries: 5
     #depends_on:
     #  - zookeeper
   mongo:
@@ -58,28 +82,18 @@ services:
       - 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:-opensourcemano}/keystone:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-6}
     networks:
       - netOSM
     environment:
-      DB_HOST: keystone-db
+      DB_HOST: mysql
     env_file:
       - ./keystone.env
     ports:
       - "${OSM_KEYSTONE_PORTS:-5000:5000}"
   nbi:
-    image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-6}
     networks:
       - netOSM
     volumes:
@@ -95,7 +109,7 @@ services:
     #  - kafka
     #  - mongo
   lcm:
-    image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-6}
     networks:
       - netOSM
     volumes:
@@ -110,10 +124,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:
@@ -121,51 +137,67 @@ services:
 #    ports:
 #      - "3306:3306"
   ro:
-    image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-6}
     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:-opensourcemano}/mon:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-6}
     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:-opensourcemano}/pol:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-6}
     networks:
       - netOSM
     volumes:
       - pol_db:/app/database
     environment:
-      OSMPOL_SQL_DATABASE_URI: sqlite:///app/database/policy_module.db
-      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:-opensourcemano}/light-ui:${TAG:-latest}
+    image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-6}
     networks:
       - netOSM
     environment:
       OSM_SERVER: nbi
     #depends_on:
     #  - nbi
+    env_file:
+      - ./lwui.env
     ports:
       - "${OSM_UI_PORTS:-80:80}"