updated containers

docker-compose.yml

@@ -3,7 +3,7 @@ version: '2'
 services:
 
     stream_icecast:
-        image: silentprotest/icecast
+        image: silentprotest/icecast-arm
         build: icecast
         networks:
             - www
@@ -15,47 +15,18 @@ services:
         restart: always
 
     stream_liquidsoap:
-        image: silentprotest/liquidsoap
+        image: silentprotest/liquidsoap-arm
         build: liquidsoap/
         networks:
             - stream
         volumes:
-             - ./liquidsoap/radio.liq:/radio.liq:ro
              - ./media/:/media/radio:ro
         depends_on:
             - stream_icecast
         restart: always
 
-    chat_server:
-        image: silentprotest/lets-chat
-        build: chat/
-        networks:
-            - www
-            - chat_db
-        volumes:
-            - chat_config:/usr/src/app/config
-            - chat_uploads:/usr/src/app/uploads
-        environment:
-            - LCB_DATABASE_URI=mongodb://chat_mongo/letschat
-            - LCB_XMPP_ENABLE=true
-        ports:
-            - 5222:5222
-            - 81:8080
-        depends_on:
-            - chat_mongo
-        restart: always
-
-    chat_mongo:
-        image: jixer/rpi-mongo
-        networks:
-            - chat_db
-        volumes:
-            - chat_mongo_data:/data/db
-            - chat_mongo_config:/data/configdb
-        restart: always
-
     video_server:
-        image: silentprotest/hublin
+        image: silentprotest/hublin-arm
         build: video/
         networks:
             - www
@@ -70,7 +41,8 @@ services:
         restart: always
 
     video_mongo:
-        image: jixer/rpi-mongo
+        image: silentprotest/mongo-arm
+        build: mongo/
         networks:
             - video_db
         volumes:
@@ -91,6 +63,7 @@ services:
         networks:
             - www
         volumes:
+            - ./www/nginx.conf:/etc/nginx/nginx.conf:ro
             - ./www/conf.d/:/etc/nginx/conf.d/:ro
             - ./www/party/html:/usr/share/nginx/html:ro
             - ./www/fullchain.pem:/ssl.crt:ro
@@ -103,16 +76,11 @@ services:
 
 
 networks:
-    chat_db:
     video_db:
     stream:
     www:
 
 volumes:
-    chat_config: {}
-    chat_uploads: {}
-    chat_mongo_data: {}
-    chat_mongo_config: {}
     video_mongo_data: {}
     video_mongo_config: {}
     video_redis_data: {}

icecast/Dockerfile

@@ -11,6 +11,8 @@ USER icecast2
 
 WORKDIR /etc/icecast2
 
+COPY icecast.xml /etc/icecast2/icecast.xml
+
 EXPOSE 8000
 
 CMD ["icecast2", "-c", "icecast.xml" ]

liquidsoap/Dockerfile

@@ -13,4 +13,6 @@ USER liquidsoap
 
 EXPOSE 8005
 
+COPY radio.liq /radio.liq
+
 CMD ["liquidsoap", "/radio.liq"]

mongo/Dockerfile

@@ -0,0 +1,7 @@
+FROM jixer/rpi-mongo
+
+MAINTAINER SilentProtest
+
+COPY reset_entry.sh /reset_entry.sh
+
+ENTRYPOINT ["/reset_entry.sh"]

mongo/reset_entry.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+echo "Performing Reset"
+rm -rf /data/db/* /data/configdb/*
+
+echo "Starting"
+/entrypoint.sh mongod
+

video/Dockerfile

@@ -2,13 +2,15 @@ FROM armhf/node
 
 MAINTAINER SilentProtest
 
-ADD hublin/ /src
+RUN npm install -g mocha grunt-cli bower karma-cli
 
-RUN npm install -g mocha grunt-cli bower karma-cli && cd /src && npm install --production --unsafe-perm
+RUN git clone --depth 1 --recursive https://github.com/linagora/hublin.git /src
+
+RUN cd /src && npm install --production --unsafe-perm
 
 RUN cd /src/modules/hublin-easyrtc-connector && npm install --production
 
-ADD hublin/config/db.json.docker /src/config/db.json
+RUN cp /src/config/db.json.docker /src/config/db.json
 
 ENV HUBLIN_REDIS_HOST redis
 ENV HUBLIN_REDIS_PORT 6379

www/conf.d/_global.conf

@@ -19,6 +19,9 @@ proxy_set_header Upgrade $http_upgrade;
 proxy_set_header Connection "upgrade";
 
 
+# for performance
+access_log off;
+
 #
 # SSL Config From: https://cipherli.st/
 #

www/nginx.conf

@@ -0,0 +1,36 @@
+
+user  nginx;
+#worker_processes  1;
+
+worker_processes auto;
+worker_cpu_affinity auto;
+
+
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    include /etc/nginx/conf.d/*.conf;
+}