Remove dependency on configuration files

This commit is contained in:
Alex Ellis 2017-07-12 20:46:05 +01:00
parent 283d311b08
commit 4cc299d4c8

View File

@ -17,11 +17,7 @@ services:
constraints: [node.role == manager] constraints: [node.role == manager]
prometheus: prometheus:
image: functions/prometheus-legacy:1.5.2 # Mirrors version 1.5.2 of quay.io/prometheus/prometheus:latest image: functions/prometheus:latest # autobuild from Dockerfile in repo.
volumes:
- ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
- ./prometheus/alert.rules:/etc/prometheus/alert.rules
command: "-config.file=/etc/prometheus/prometheus.yml -storage.local.path=/prometheus -storage.local.memory-chunks=10000 --alertmanager.url=http://alertmanager:9093" command: "-config.file=/etc/prometheus/prometheus.yml -storage.local.path=/prometheus -storage.local.memory-chunks=10000 --alertmanager.url=http://alertmanager:9093"
ports: ports:
- 9090:9090 - 9090:9090
@ -37,7 +33,7 @@ services:
constraints: [node.role == manager] constraints: [node.role == manager]
alertmanager: alertmanager:
image: quay.io/prometheus/alertmanager image: functions/alertmanager:latest # autobuild from Dockerfile in repo.
environment: environment:
no_proxy: "gateway" no_proxy: "gateway"
volumes: volumes:
@ -82,7 +78,7 @@ services:
# Node.js gives OS info about the node (Host) # Node.js gives OS info about the node (Host)
nodeinfo: nodeinfo:
image: alexellis2/faas-nodeinfo:latest image: functions/nodeinfo:latest
labels: labels:
function: "true" function: "true"
depends_on: depends_on: