projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix bug 964: Duplicated dashboards. Set fixed port for Grafana"
[osm/devops.git]
/
installers
/
docker
/
docker-compose.yaml
diff --git
a/installers/docker/docker-compose.yaml
b/installers/docker/docker-compose.yaml
index
b87f27b
..
3fdfbc1
100644
(file)
--- a/
installers/docker/docker-compose.yaml
+++ b/
installers/docker/docker-compose.yaml
@@
-88,8
+88,11
@@
services:
ports:
- "${OSM_PROM_PORTS:-9091:9090}"
volumes:
ports:
- "${OSM_PROM_PORTS:-9091:9090}"
volumes:
- - ./prometheus
.yml:/etc/prometheus/prometheus.yml:ro
+ - ./prometheus
/:/etc/prometheus/
- prom_db:/prometheus
- prom_db:/prometheus
+ command:
+ - '--config.file=/etc/prometheus/prometheus.yml'
+ - '--web.enable-lifecycle'
networks:
- netOSM
logging:
networks:
- netOSM
logging:
@@
-110,7
+113,7
@@
services:
networks:
- netOSM
keystone:
networks:
- netOSM
keystone:
- image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-
6
}
+ image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-
7
}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-125,7
+128,7
@@
services:
max-size: "100m"
max-file: "2"
nbi:
max-size: "100m"
max-file: "2"
nbi:
- image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-
6
}
+ image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-
7
}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-146,7
+149,7
@@
services:
# - kafka
# - mongo
lcm:
# - kafka
# - mongo
lcm:
- image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-
6
}
+ image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-
7
}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-184,7
+187,7
@@
services:
# ports:
# - "3306:3306"
ro:
# ports:
# - "3306:3306"
ro:
- image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-
6
}
+ image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-
7
}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-203,7
+206,7
@@
services:
max-size: "100m"
max-file: "2"
mon:
max-size: "100m"
max-file: "2"
mon:
- image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-
6
}
+ image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-
7
}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-223,7
+226,7
@@
services:
max-file: 5
max-size: 10m
pol:
max-file: 5
max-size: 10m
pol:
- image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-
6
}
+ image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-
7
}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-242,7
+245,7
@@
services:
max-file: 5
max-size: 10m
light-ui:
max-file: 5
max-size: 10m
light-ui:
- image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-
6
}
+ image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-
7
}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-270,3
+273,9
@@
services:
- "${OSM_GRAFANA_PORTS:-3000:3000}"
networks:
- netOSM
- "${OSM_GRAFANA_PORTS:-3000:3000}"
networks:
- netOSM
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "100m"
+ max-file: "2"
+