Pre merge

docker-compose.yml

@@ -69,13 +69,13 @@ nginx:
     volumes_from:
         - api
 icecast:
-    image: moul/icecast:latest
+    build: ./radio/
     volumes:
         - logs:/var/log/icecast2
         - /etc/localtime:/etc/localtime:ro
     environment:
         - ICECAST_SOURCE_PASSWORD=RDzNlgqmj67vk
-        - ICECAST_ADMIN_PASSWORD=CrVuP5evoJZ0.
+        - ICECAST_ADMIN_PASSWORD=CrVuP5evoJZ0
         - ICECAST_RELAY_PASSWORD=9PmUbI1mLne9o
     ports:
         - 8000:8000

radio/Dockerfile

@@ -1,5 +1,7 @@
-FROM ubuntu:wily
-MAINTAINER Fergal Moran "Ferg@lMoran.me"
+FROM ubuntu:trusty
+
+MAINTAINER Manfred Touron "m@42.am"
+
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get -qq -y update && \
@@ -9,6 +11,10 @@ RUN apt-get -qq -y update && \
 RUN easy_install supervisor && \
     easy_install supervisor-stdout
 
-ADD icecast2/icecast.xml /etc/icecast2/
-ADD default/icecast2 /etc/default/
-ADD supervisord.conf /etc/supervisord.conf
+CMD ["/start.sh"]
+EXPOSE 8000
+VOLUME ["/config", "/var/log/icecast2", "/etc/icecast2"]
+
+ADD ./start.sh /start.sh
+ADD ./etc /etc
+RUN chown -R icecast2 /etc/icecast2

radio/default/icecast2

@@ -1,19 +0,0 @@
-# Defaults for icecast2 initscript
-# sourced by /etc/init.d/icecast2
-# installed at /etc/default/icecast2 by the maintainer scripts
-
-#
-# This is a POSIX shell fragment
-#
-
-# Full path to the server configuration file
-CONFIGFILE="/etc/icecast2/icecast.xml"
-
-# Name or ID of the user and group the daemon should run under
-USERID=icecast2
-GROUPID=icecast
-
-# Edit /etc/icecast2/icecast.xml and change at least the passwords.
-# Change this to true when done to enable the init.d script
-ENABLE=true
-

radio/icecast2/icecast.xml

@@ -1,51 +0,0 @@
-<icecast>
-    <location>Cork Like</location>
-    <admin>icemaster@deepsouthsounds.com</admin>
-
-    <limits>
-        <clients>100</clients>
-        <sources>2</sources>
-        <threadpool>5</threadpool>
-        <queue-size>524288</queue-size>
-        <client-timeout>30</client-timeout>
-        <header-timeout>15</header-timeout>
-        <source-timeout>10</source-timeout>
-        <burst-on-connect>1</burst-on-connect>
-        <burst-size>65535</burst-size>
-    </limits>
-
-    <authentication>
-        <source-password>RDzNlgqmj67vk</source-password>
-        <relay-password>9PmUbI1mLne9o</relay-password>
-
-        <admin-user>admin</admin-user>
-        <admin-password>CrVuP5evoJZ0.</admin-password>
-    </authentication>
-
-    <hostname>radio.deepsouthsounds.com</hostname>
-
-    <listen-socket>
-        <port>8351</port>
-        <shoutcast-mount>/dss</shoutcast-mount>
-    </listen-socket>
-    <fileserve>1</fileserve>
-
-    <paths>
-        <basedir>/usr/share/icecast2</basedir>
-        <logdir>/var/log/icecast2</logdir>
-        <webroot>/usr/share/icecast2/web</webroot>
-        <adminroot>/usr/share/icecast2/admin</adminroot>
-        <alias source="/" destination="/status.xsl"/>
-    </paths>
-
-    <logging>
-        <accesslog>access.log</accesslog>
-        <errorlog>error.log</errorlog>
-      	<loglevel>3</loglevel>
-      	<logsize>10000</logsize>
-    </logging>
-
-    <security>
-        <chroot>0</chroot>
-    </security>
-</icecast>

radio/supervisord.conf

@@ -1,33 +0,0 @@
-[unix_http_server]
-file=/tmp/supervisor.sock
-
-[supervisord]
-logfile=/tmp/supervisord.log
-logfile_maxbytes=50MB
-logfile_backups=10
-loglevel=info
-pidfile=/tmp/supervisord.pid
-nodaemon=false
-minfds=1024
-minprocs=200
-user=icecast2
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface
-
-[supervisorctl]
-serverurl=unix:///tmp/supervisor.sock
-
-[program:icecast2]
-user=icecast2
-command=icecast2 -n -c /etc/icecast2/icecast.xml
-stopsignal=6
-stdout_events_enabled=true
-stderr_events_enabled=true
-autorestart=true
-
-[eventlistener:stdout]
-command=supervisor_stdout
-buffer_size=100
-events=PROCESS_LOG
-result_hander=supervisor_stdout:event_handler

rebuild.sh

@@ -2,5 +2,5 @@ export PATH=$PATH:/mnt/bin/
 git pull && \
 	cd dss.web && git pull && cd .. && \
 	cd dss.api && git pull && cd .. && \
-	cd dss.radio && git radio && cd .. && \
+	cd dss.radio && git pull && cd .. && \
 	docker-compose build && docker-compose up $1