removed special characters from compose file and moved everything to labels

This commit is contained in:
vegasbrianc 2015-11-18 11:29:15 +01:00
parent 1129344fd8
commit b22c48809f
1 changed files with 0 additions and 12 deletions

View File

@ -2,7 +2,6 @@ prometheus:
build: "prom/" build: "prom/"
ports: ports:
- "9090:9090" - "9090:9090"
name: prometheus
links: links:
- "exporter:export" - "exporter:export"
- "cadvisor:cadvisor" - "cadvisor:cadvisor"
@ -16,7 +15,6 @@ exporter:
- "9104:9104" - "9104:9104"
expose: expose:
- "9104" - "9104"
name: exporter
sqlite3: sqlite3:
image: "prom/promdash" image: "prom/promdash"
@ -37,11 +35,6 @@ promdash:
- /tmp/prom:/tmp/prom - /tmp/prom:/tmp/prom
environment: environment:
- "DATABASE_URL=sqlite3:/tmp/prom/file.sqlite3" - "DATABASE_URL=sqlite3:/tmp/prom/file.sqlite3"
<<<<<<< HEAD
name: "promdash"
=======
name: promdash
>>>>>>> 8fd61f32ac17388fe8505e41ddbd2fb91babe945
cadvisor: cadvisor:
image: "google/cadvisor" image: "google/cadvisor"
@ -54,8 +47,3 @@ cadvisor:
- "8080:8080" - "8080:8080"
expose: expose:
- "8080" - "8080"
<<<<<<< HEAD
name: "cadvisor"
=======
name: cadvisor
>>>>>>> 8fd61f32ac17388fe8505e41ddbd2fb91babe945