devenv: switching back using loki master plus various fixes

This commit is contained in:
Marcus Efraimsson
2019-02-04 09:55:23 +01:00
parent 0442a86400
commit fdd5ac1895

View File

@@ -1,24 +1,14 @@
version: "3"
networks:
loki:
services:
loki:
image: grafana/loki:master-3e6a75e
image: grafana/loki:master
ports:
- "3100:3100"
command: -config.file=/etc/loki/local-config.yaml
networks:
- loki
promtail:
image: grafana/promtail:master-3e6a75e
image: grafana/promtail:master
volumes:
- ./docker/blocks/loki/config.yaml:/etc/promtail/docker-config.yaml
- /var/log:/var/log
- ../data/log:/var/log/grafana
command:
-config.file=/etc/promtail/docker-config.yaml
networks:
- loki