Moved to images

.gitignore

@@ -2,3 +2,6 @@
 dss.web
 dss.api
 dss.radio
+
+api_env
+web_env

docker-compose.yml

@@ -7,6 +7,9 @@ rabbitmq:
         - "5672:5672"
         - "15672:15672"
 
+redis:
+    image: redis
+
 postgres:
     restart: always
     image: postgres:latest
@@ -15,9 +18,6 @@ postgres:
     ports:
         - "5432:5432"
 
-redis:
-    image: redis
-
 data:
   restart: no
   image: postgres:latest
@@ -26,7 +26,10 @@ data:
   command: /bin/true
 
 celery:
-    build: ./dss.api
+    image: fergalmoran/dss.api
+    #build: ./dss.api
+    env_file:
+        - ./api_env
     volumes_from:
         - api
     links:
@@ -36,42 +39,33 @@ celery:
     command: ./run_celery.sh
 
 api:
-    build: ./dss.api
+    image: fergalmoran/dss.api
+    #build: ./dss.api
     volumes:
         - /files
     ports:
         - "8001:8001"
+    env_file:
+        - ./api_env
     links:
         - "postgres:postgres"
         - "redis:redis"
         - "icecast:icecast"
-        - "radio:radio"
         - "rabbitmq:rabbitmq"
     command: ./run_web.sh
 
 web:
+    image: fergalmoran/dss.web
+    #build: ./dss.web
+    env_file: 
+        - ./web_env
     restart: always
-    build: ./dss.web
     links:
         - "redis:redis"
     ports:
         - "8080:8080"
-
-nginx:
-    restart: always
-    build: ./nginx/
-    ports:
-        - "80:80"
-        - "443:443"
-    links:
-        - "api:api"
-        - "web:web"
-        - "icecast:icecast"
-        - "radio:radio"
-    volumes_from:
-        - api
 icecast:
-    build: ./radio/
+    build: ./icecast/
     volumes:
         - ./logs:/var/log/icecast2
         - /etc/localtime:/etc/localtime:ro
@@ -88,4 +82,14 @@ radio:
     links:
         - "icecast:icecast"
         - "api:api"
-
+nginx:
+    restart: always
+    build: ./nginx/
+    ports:
+        - "80:80"
+        - "443:443"
+    links:
+        - "api:api"
+        - "web:web"
+        - "icecast:icecast"
+        - "radio:radio"

icecast/Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:trusty
 
-MAINTAINER Manfred Touron "m@42.am"
+MAINTAINER Fergal Moran "Ferg@lMoran.me"
 
 ENV DEBIAN_FRONTEND noninteractive
 

icecast/start.sh

@@ -20,6 +20,4 @@ if [ -n "$ICECAST_PASSWORD" ]; then
     sed -i "s/<password>[^<]*<\/password>/<password>$ICECAST_PASSWORD<\/password>/g" /etc/icecast2/icecast.xml
 fi
 
-cat /etc/icecast2/icecast.xml
-
 supervisord -n -c /etc/supervisord.conf

postgres/scaffold_db.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+sudo -u postgres psql -h 127.0.0.1 -c "CREATE DATABASE deepsouthsounds"
 sudo -u postgres psql -h 127.0.0.1 -c "CREATE USER deepsouthsounds WITH PASSWORD 'deepsouthsounds'"
 sudo -u postgres psql -h 127.0.0.1 -c "CREATE DATABASE deepsouthsounds OWNER deepsouthsounds"
-sudo -u postgres psql -h 127.0.0.1 deepsouthsounds < /home/fergalm/Dropbox/dss.sql
+sudo -u postgres psql -h 127.0.0.1 deepsouthsounds < /tmp/20151025-203518.sql