merge branch 'master' of https://github.com/fergalmoran/dss.docker

.gitignore

@@ -2,3 +2,7 @@
 dss.web
 dss.api
 dss.radio
+
+api_env
+web_env
+radio_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,9 @@ data:
   command: /bin/true
 
 celery:
-    build: ./dss.api
+    image: fergalmoran/dss.api
+    env_file:
+        - ./api_env
     volumes_from:
         - api
     links:
@@ -36,11 +38,13 @@ celery:
     command: ./run_celery.sh
 
 api:
-    build: ./dss.api
+    image: fergalmoran/dss.api
     volumes:
         - /files
     ports:
         - "8001:8001"
+    env_file:
+        - ./api_env
     links:
         - "postgres:postgres"
         - "redis:redis"
@@ -49,13 +53,34 @@ api:
     command: ./run_web.sh
 
 web:
+    image: fergalmoran/dss.web
+    env_file:
+        - ./web_env
     restart: always
-    build: ./dss.web
     links:
         - "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:
+        - ./radio_env
+    ports:
+        - "8888:8888"
+    links:
+        - "icecast:icecast"
+        - "api:api"
 nginx:
     restart: always
     build: ./nginx/
@@ -67,24 +92,3 @@ nginx:
         - "web:web"
         - "icecast:icecast"
         - "radio:radio"
-    volumes_from:
-        - api
-icecast:
-    build: ./radio/
-    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:
-    build: dss.radio/
-    ports:
-        - "8888:8888"
-    links:
-        - "icecast:icecast"
-        - "api:api"
-

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