projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add smoke/health tests to OSM stage_3"
[osm/devops.git]
/
installers
/
docker
/
docker-compose.yaml
diff --git
a/installers/docker/docker-compose.yaml
b/installers/docker/docker-compose.yaml
index
0b24db2
..
c09de86
100644
(file)
--- a/
installers/docker/docker-compose.yaml
+++ b/
installers/docker/docker-compose.yaml
@@
-1,23
+1,32
@@
version: '3'
volumes:
version: '3'
volumes:
- OSMstorage:
+ ro_db:
+ mongo_db:
+ mon_db:
+ osm_packages:
networks:
netOSM:
networks:
netOSM:
- external: true
+ external:
+ name: ${OSM_NETWORK:-netOSM}
#driver: overlay
#driver_opts:
# com.docker.network.driver.mtu: "1446"
services:
zookeeper:
#driver: overlay
#driver_opts:
# com.docker.network.driver.mtu: "1446"
services:
zookeeper:
- image: wurstmeister/zookeeper
- ports:
- - "2181:2181"
+ image: wurstmeister/zookeeper
:${ZOOKEEPER_TAG:-latest}
+
#
ports:
+
#
- "2181:2181"
networks:
- netOSM
networks:
- netOSM
+ healthcheck:
+ test: echo stat | nc localhost 2181
+ interval: 10s
+ timeout: 10s
+ retries: 3
kafka:
kafka:
- image: wurstmeister/kafka
+ image: wurstmeister/kafka
:${KAFKA_TAG:-latest}
ports:
ports:
- - "9092
:9092
"
+ - "9092"
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-30,30
+39,32
@@
services:
# - zookeeper
mongo:
image: mongo
# - zookeeper
mongo:
image: mongo
- ports:
- - "27017:27017"
+
#
ports:
+
#
- "27017:27017"
networks:
- netOSM
networks:
- netOSM
+ volumes:
+ - mongo_db:/data/db
nbi:
nbi:
- image: osm/nbi
+ image: osm/nbi
:${TAG:-latest}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
- -
OSMstorage
:/app/storage
+ -
osm_packages
:/app/storage
environment:
OSMNBI_DATABASE_HOST: mongo
OSMNBI_MESSAGE_HOST: kafka
ports:
environment:
OSMNBI_DATABASE_HOST: mongo
OSMNBI_MESSAGE_HOST: kafka
ports:
- - "
9999:9999
"
+ - "
${OSM_NBI_PORTS:-9999:9999}
"
#depends_on:
# - kafka
# - mongo
lcm:
#depends_on:
# - kafka
# - mongo
lcm:
- image: osm/lcm
+ image: osm/lcm
:${TAG:-latest}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
- -
OSMstorage
:/app/storage
+ -
osm_packages
:/app/storage
environment:
OSMLCM_RO_HOST: ro
OSMLCM_DATABASE_HOST: mongo
environment:
OSMLCM_RO_HOST: ro
OSMLCM_DATABASE_HOST: mongo
@@
-65,15
+76,17
@@
services:
# - mongo
# - ro
ro-db:
# - mongo
# - ro
ro-db:
- image: mysql
+ image: mysql
:5
networks:
- netOSM
networks:
- netOSM
+ volumes:
+ - ro_db:/var/lib/mysql
env_file:
- ./ro-db.env
env_file:
- ./ro-db.env
- ports:
- - "3306:3306"
+
#
ports:
+
#
- "3306:3306"
ro:
ro:
- image: osm/ro
+ image: osm/ro
:${TAG:-latest}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-83,19
+96,24
@@
services:
#depends_on:
# - ro-db
ports:
#depends_on:
# - ro-db
ports:
- - "
9090:9090
"
+ - "
${OSM_RO_PORTS:-9090:9090}
"
mon:
mon:
- image: osm/mon
+ image: osm/mon
:${TAG:-latest}
networks:
- netOSM
networks:
- netOSM
+ volumes:
+ - mon_db:/app/database
environment:
BROKER_URI: kafka:9092
environment:
BROKER_URI: kafka:9092
+ DATABASE: sqlite:///app/database/mon_sqlite.db
+ env_file:
+ - ./mon.env
#depends_on:
# - kafka
ports:
#depends_on:
# - kafka
ports:
- - "8662
:8662
"
+ - "8662"
pm:
pm:
- image: osm/pm
+ image: osm/pm
:${TAG:-latest}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-104,7
+122,7
@@
services:
# - kafka
# - mon
light-ui:
# - kafka
# - mon
light-ui:
- image: osm/light-ui
+ image: osm/light-ui
:${TAG:-latest}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-112,5
+130,4
@@
services:
#depends_on:
# - nbi
ports:
#depends_on:
# - nbi
ports:
- - "80:80"
-
+ - "${OSM_UI_PORTS:-80:80}"