projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
a1e88bc
..
c09de86
100644
(file)
--- a/
installers/docker/docker-compose.yaml
+++ b/
installers/docker/docker-compose.yaml
@@
-6,21
+6,27
@@
volumes:
osm_packages:
networks:
netOSM:
osm_packages:
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
+ image: wurstmeister/zookeeper
:${ZOOKEEPER_TAG:-latest}
# ports:
# - "2181:2181"
networks:
- netOSM
# ports:
# - "2181:2181"
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:
@@
-40,7
+46,7
@@
services:
volumes:
- mongo_db:/data/db
nbi:
volumes:
- mongo_db:/data/db
nbi:
- image: osm/nbi
+ image: osm/nbi
:${TAG:-latest}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-49,12
+55,12
@@
services:
OSMNBI_DATABASE_HOST: mongo
OSMNBI_MESSAGE_HOST: kafka
ports:
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:
@@
-80,7
+86,7
@@
services:
# ports:
# - "3306:3306"
ro:
# ports:
# - "3306:3306"
ro:
- image: osm/ro
+ image: osm/ro
:${TAG:-latest}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-90,9
+96,9
@@
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
volumes:
networks:
- netOSM
volumes:
@@
-105,9
+111,9
@@
services:
#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:
@@
-116,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:
@@
-124,5
+130,4
@@
services:
#depends_on:
# - nbi
ports:
#depends_on:
# - nbi
ports:
- - "80:80"
-
+ - "${OSM_UI_PORTS:-80:80}"