X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fdocker%2Fdocker-compose.yaml;h=c0ca27def8a8ea8d9f3f016275c2e8692fcbdb69;hb=34124188fc292fe3df83bb7d08cbe0ff3d3a2b3d;hp=01b4d66bd62483d4cf6f3370edd1d545df29be1e;hpb=41012606c202ebf1b978f8cb777e5cb95708bec6;p=osm%2Fdevops.git

diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml
index 01b4d66b..c0ca27de 100644
--- a/installers/docker/docker-compose.yaml
+++ b/installers/docker/docker-compose.yaml
@@ -1,23 +1,33 @@
 version: '3'
 volumes:
-  OSMstorage:
+  ro_db:
+  mongo_db:
+  mon_db:
+  osm_packages:
+  keystone_db:
 networks:
   netOSM:
-    external: true
+    external:
+      name: ${OSM_NETWORK:-netosm}
     #driver: overlay
     #driver_opts:
     #  com.docker.network.driver.mtu: "1446"
 services:
   zookeeper:
-    image: wurstmeister/zookeeper
+    image: wurstmeister/zookeeper:${ZOOKEEPER_TAG:-latest}
 #    ports:
 #      - "2181:2181"
     networks:
       - netOSM
+    healthcheck:
+      test: echo stat | nc localhost 2181
+      interval: 10s
+      timeout: 10s
+      retries: 3
   kafka:
-    image: wurstmeister/kafka
+    image: wurstmeister/kafka:${KAFKA_TAG:-latest}
     ports:
-      - "9092:9092"
+      - "9092"
     networks:
       - netOSM
     environment:
@@ -34,26 +44,50 @@ services:
 #      - "27017:27017"
     networks:
       - netOSM
+    volumes:
+      - mongo_db:/data/db
+  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}
+    networks:
+      - netOSM
+    environment:
+      DB_HOST: keystone-db
+    env_file:
+      - ./keystone.env
+    ports:
+      - "${OSM_KEYSTONE_PORTS:-5000:5000}"
   nbi:
-    image: osm/nbi
+    image: ${DOCKER_USER:-osm}/nbi:${TAG:-latest}
     networks:
       - netOSM
     volumes:
-      - OSMstorage:/app/storage
+      - osm_packages:/app/storage
     environment:
       OSMNBI_DATABASE_HOST: mongo
       OSMNBI_MESSAGE_HOST: kafka
+    env_file:
+      - ./nbi.env
     ports:
-      - "9999:9999"
+      - "${OSM_NBI_PORTS:-9999:9999}"
     #depends_on:
     #  - kafka
     #  - mongo
   lcm:
-    image: osm/lcm
+    image: ${DOCKER_USER:-osm}/lcm:${TAG:-latest}
     networks:
       - netOSM
     volumes:
-      - OSMstorage:/app/storage
+      - osm_packages:/app/storage
     environment:
       OSMLCM_RO_HOST: ro
       OSMLCM_DATABASE_HOST: mongo
@@ -68,12 +102,14 @@ services:
     image: mysql:5
     networks:
       - netOSM
+    volumes:
+      - ro_db:/var/lib/mysql
     env_file:
       - ./ro-db.env
 #    ports:
 #      - "3306:3306"
   ro:
-    image: osm/ro
+    image: ${DOCKER_USER:-osm}/ro:${TAG:-latest}
     networks:
       - netOSM
     environment:
@@ -83,21 +119,24 @@ services:
     #depends_on:
     #  - ro-db
     ports:
-      - "9090:9090"
+      - "${OSM_RO_PORTS:-9090:9090}"
   mon:
-    image: osm/mon
+    image: ${DOCKER_USER:-osm}/mon:${TAG:-latest}
     networks:
       - netOSM
+    volumes:
+      - mon_db:/app/database
     environment:
       BROKER_URI: kafka:9092
+      DATABASE: sqlite:///app/database/mon_sqlite.db
     env_file:
       - ./mon.env
+    ports:
+      - "${OSM_MON_PORTS:-8662:8662}"
     #depends_on:
     #  - kafka
-    ports:
-      - "8662:8662"
-  pm:
-    image: osm/pm
+  pol:
+    image: ${DOCKER_USER:-osm}/pol:${TAG:-latest}
     networks:
       - netOSM
     environment:
@@ -106,7 +145,7 @@ services:
     #  - kafka
     #  - mon
   light-ui:
-    image: osm/light-ui
+    image: ${DOCKER_USER:-osm}/light-ui:${TAG:-latest}
     networks:
       - netOSM
     environment:
@@ -114,5 +153,4 @@ services:
     #depends_on:
     #  - nbi
     ports:
-      - "80:80"
-
+      - "${OSM_UI_PORTS:-80:80}"