From b22c48809f719f6c39dca2c238be6901bfaa0849 Mon Sep 17 00:00:00 2001
From: vegasbrianc <brian.christner@gmail.com>
Date: Wed, 18 Nov 2015 11:29:15 +0100
Subject: [PATCH] removed special characters from compose file and moved
 everything to labels

---
 docker-compose.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index beea4af..59ab10a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,6 @@ prometheus:
   build: "prom/"
   ports:
     - "9090:9090"
-  name: prometheus
   links:
     - "exporter:export"
     - "cadvisor:cadvisor"
@@ -16,7 +15,6 @@ exporter:
     - "9104:9104"
   expose:
     - "9104"
-  name: exporter
 
 sqlite3:
   image: "prom/promdash"
@@ -37,11 +35,6 @@ promdash:
     - /tmp/prom:/tmp/prom
   environment:
     - "DATABASE_URL=sqlite3:/tmp/prom/file.sqlite3"
-<<<<<<< HEAD
-  name: "promdash"
-=======
-  name: promdash
->>>>>>> 8fd61f32ac17388fe8505e41ddbd2fb91babe945
 
 cadvisor:
   image: "google/cadvisor"
@@ -54,8 +47,3 @@ cadvisor:
     - "8080:8080"
   expose:
     - "8080"
-<<<<<<< HEAD
-  name: "cadvisor"
-=======
-  name: cadvisor
->>>>>>> 8fd61f32ac17388fe8505e41ddbd2fb91babe945