From 918191825d0243ff23a4927248f4218d8c8e8fc7 Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Tue, 2 Feb 2016 20:15:14 +0000
Subject: [PATCH] docker-compose

---
 docker-compose.yml | 46 ++++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 81edb78..9145277 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,17 +25,17 @@ data:
     - /var/lib/postgresql
   command: /bin/true
 
-celery:
-    image: fergalmoran/dss.api
-    env_file:
-        - ./api_env
-    volumes_from:
-        - api
-    links:
-        - "postgres:postgres"
-        - "redis:redis"
-        - "rabbitmq:rabbitmq"
-    command: ./run_celery.sh
+icecast:
+    build: ./icecast/
+    volumes:
+        - ./logs:/var/log/icecast2
+        - /etc/localtime:/etc/localtime:ro
+    environment:
+        - ICECAST_SOURCE_PASSWORD=RDzNlgqmj67vk
+        - ICECAST_ADMIN_PASSWORD=CrVuP5evoJZ0
+        - ICECAST_RELAY_PASSWORD=9PmUbI1mLne9o
+    ports:
+        - 8000:8000
 
 api:
     image: fergalmoran/dss.api
@@ -52,6 +52,18 @@ api:
         - "rabbitmq:rabbitmq"
     command: ./run_web.sh
 
+celery:
+    image: fergalmoran/dss.api
+    env_file:
+        - ./api_env
+    volumes_from:
+        - api
+    links:
+        - "postgres:postgres"
+        - "redis:redis"
+        - "rabbitmq:rabbitmq"
+    command: ./run_celery.sh
+
 web:
     image: fergalmoran/dss.web
     env_file:
@@ -61,17 +73,7 @@ web:
         - "redis:redis"
     ports:
         - "8080:8080"
-icecast:
-    build: ./icecast/
-    volumes:
-        - ./logs:/var/log/icecast2
-        - /etc/localtime:/etc/localtime:ro
-    environment:
-        - ICECAST_SOURCE_PASSWORD=RDzNlgqmj67vk
-        - ICECAST_ADMIN_PASSWORD=CrVuP5evoJZ0
-        - ICECAST_RELAY_PASSWORD=9PmUbI1mLne9o
-    ports:
-        - 8000:8000
+
 radio:
     image: fergalmoran/dss.radio
     env_file: