remove logstash dockerfile and use docker volumes for these finicky apps without on-fs requirements

pull/3/head
lance 5 years ago
parent 58eae6dd6c
commit 5d224818b4

@ -1,6 +0,0 @@
FROM docker.elastic.co/logstash/logstash:7.5.2
RUN rm -f /usr/share/logstash/pipeline/logstash.conf
RUN /usr/share/logstash/bin/logstash-plugin install logstash-output-elasticsearch
ADD files/logstash.conf /usr/share/logstash/pipeline/logstash.conf

@ -30,11 +30,15 @@ services:
- ./Docker/files/grafana/dashboards.yaml:/etc/grafana/provisioning/dashboards/default.yaml:ro - ./Docker/files/grafana/dashboards.yaml:/etc/grafana/provisioning/dashboards/default.yaml:ro
- ./Docker/files/grafana/prometheus.yaml:/etc/grafana/provisioning/datasources/prometheus.yaml:ro - ./Docker/files/grafana/prometheus.yaml:/etc/grafana/provisioning/datasources/prometheus.yaml:ro
- ./Docker/files/grafana/xmrauctions_metrics.json:/var/lib/grafana/dashboards/xmrauctions_metrics.json:ro - ./Docker/files/grafana/xmrauctions_metrics.json:/var/lib/grafana/dashboards/xmrauctions_metrics.json:ro
- ./data/grafana:/var/lib/grafana - grafana:/var/lib/grafana
prometheus: prometheus:
image: prom/prometheus:v2.15.2 image: prom/prometheus:v2.15.2
ports: ports:
- 9090:9090 - 9090:9090
volumes: volumes:
- ./Docker/files/prometheus:/etc/prometheus - ./Docker/files/prometheus:/etc/prometheus
- ./data/prometheus/ - prometheus:/prometheus
volumes:
grafana:
prometheus: