projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update docker user for osmclient
[osm/devops.git]
/
installers
/
docker
/
docker-compose.yaml
diff --git
a/installers/docker/docker-compose.yaml
b/installers/docker/docker-compose.yaml
index
4a7503a
..
e45fabd
100644
(file)
--- a/
installers/docker/docker-compose.yaml
+++ b/
installers/docker/docker-compose.yaml
@@
-46,6
+46,15
@@
services:
- netOSM
volumes:
- mongo_db:/data/db
- netOSM
volumes:
- mongo_db:/data/db
+ prometheus:
+ image: prom/prometheus:${PROMETHEUS_TAG:-latest}
+ hostname: prometheus
+ ports:
+ - "${OSM_PROM_PORTS:-9091:9090}"
+ volumes:
+ - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
+ networks:
+ - netOSM
keystone-db:
image: mariadb:10
networks:
keystone-db:
image: mariadb:10
networks:
@@
-57,7
+66,7
@@
services:
# ports:
# - "3306:3306"
keystone:
# ports:
# - "3306:3306"
keystone:
- image:
osm
/keystone:${TAG:-latest}
+ image:
${DOCKER_USER:-osm}
/keystone:${TAG:-latest}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-67,7
+76,7
@@
services:
ports:
- "${OSM_KEYSTONE_PORTS:-5000:5000}"
nbi:
ports:
- "${OSM_KEYSTONE_PORTS:-5000:5000}"
nbi:
- image:
osm
/nbi:${TAG:-latest}
+ image:
${DOCKER_USER:-osm}
/nbi:${TAG:-latest}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-83,7
+92,7
@@
services:
# - kafka
# - mongo
lcm:
# - kafka
# - mongo
lcm:
- image:
osm
/lcm:${TAG:-latest}
+ image:
${DOCKER_USER:-osm}
/lcm:${TAG:-latest}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-109,7
+118,7
@@
services:
# ports:
# - "3306:3306"
ro:
# ports:
# - "3306:3306"
ro:
- image:
osm
/ro:${TAG:-latest}
+ image:
${DOCKER_USER:-osm}
/ro:${TAG:-latest}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-121,7
+130,7
@@
services:
ports:
- "${OSM_RO_PORTS:-9090:9090}"
mon:
ports:
- "${OSM_RO_PORTS:-9090:9090}"
mon:
- image:
osm
/mon:${TAG:-latest}
+ image:
${DOCKER_USER:-osm}
/mon:${TAG:-latest}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-131,12
+140,12
@@
services:
DATABASE: sqlite:///app/database/mon_sqlite.db
env_file:
- ./mon.env
DATABASE: sqlite:///app/database/mon_sqlite.db
env_file:
- ./mon.env
+ ports:
+ - "${OSM_MON_PORTS:-8662:8662}"
#depends_on:
# - kafka
#depends_on:
# - kafka
- ports:
- - "8662"
- pm:
- image: osm/pm:${TAG:-latest}
+ pol:
+ image: ${DOCKER_USER:-osm}/pol:${TAG:-latest}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-145,7
+154,7
@@
services:
# - kafka
# - mon
light-ui:
# - kafka
# - mon
light-ui:
- image:
osm
/light-ui:${TAG:-latest}
+ image:
${DOCKER_USER:-osm}
/light-ui:${TAG:-latest}
networks:
- netOSM
environment:
networks:
- netOSM
environment: