extract apps-akka from core

docker-compose.yml

@@ -167,6 +167,18 @@ services:
       bbb-net:
         ipv4_address: 10.7.7.14
 
+  apps-akka:
+    build: mod/apps-akka
+    environment:
+      DOMAIN: ${DOMAIN}
+      SHARED_SECRET: ${SHARED_SECRET}
+    volumes:
+      - vol-freeswitch:/var/freeswitch/meetings
+    networks:
+      bbb-net:
+        ipv4_address: 10.7.7.15
+
+
   libreoffice:
     build: mod/libreoffice
     restart: unless-stopped

mod/apps-akka/Dockerfile

@@ -0,0 +1,28 @@
+FROM openjdk:8u252-jdk-slim-buster
+
+RUN apt update && apt-get install -y subversion wget gosu
+
+# install dockerize
+ENV DOCKERIZE_VERSION v0.6.1
+RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+    && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+    && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
+
+ENV TAG v2.3-alpha-2
+
+RUN cd / \
+    && svn checkout https://github.com/alangecker/bbb-packages/tags/$TAG/bbb-apps-akka/data/usr/share/bbb-apps-akka \
+    && rm -r /bbb-apps-akka/.svn
+
+RUN groupadd -g 998 bigbluebutton \
+    && useradd -m -u 998 -g bigbluebutton bigbluebutton \
+    && rm /bbb-apps-akka/logs \
+    && mkdir /bbb-apps-akka/logs \
+    && ln -s /dev/null /bbb-apps-akka/logs/bbb-apps-akka.log
+
+COPY application.conf /bbb-apps-akka/conf/application.conf.tmpl
+
+WORKDIR /bbb-apps-akka
+CMD dockerize \
+    -template /bbb-apps-akka/conf/application.conf.tmpl:/bbb-apps-akka/conf/application.conf \
+    gosu bigbluebutton /bbb-apps-akka/bin/bbb-apps-akka

mod/core/Dockerfile

@@ -46,7 +46,7 @@ RUN echo '#!/bin/bash\necho "mocking: systemctl $@"' > /usr/bin/systemctl && chm
 # rebuilding from here on if changed
 ENV VERSION v2.3-alpha-2
 
-RUN apt-get update && apt-get install -y bbb-web bbb-apps-akka
+RUN apt-get update && apt-get install -y bbb-web openjdk-8-jre-headless
 
 # add blank presentation files and allow conversation to pdf/svg
 RUN mkdir -p /usr/share/bigbluebutton/blank \
@@ -62,7 +62,6 @@ RUN mkdir -p /usr/share/bigbluebutton/blank \
 COPY web/bigbluebutton.properties /usr/share/bbb-web/WEB-INF/classes/bigbluebutton.properties.tmpl
 COPY web/turn-stun-servers.xml /usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml.tmpl
 
-COPY bbb-apps-akka/application.conf /usr/share/bbb-apps-akka/conf/application.conf.tmpl
 COPY web-run.sh /usr/share/bbb-web/run-prod.sh
 
 # add default presentation thumbnail

mod/core/entrypoint.sh

@@ -30,6 +30,5 @@ chown -R bigbluebutton:bigbluebutton /var/bigbluebutton
 
 dockerize \
     -template /usr/share/bbb-web/WEB-INF/classes/bigbluebutton.properties.tmpl:/usr/share/bbb-web/WEB-INF/classes/bigbluebutton.properties \
-    -template /usr/share/bbb-apps-akka/conf/application.conf.tmpl:/usr/share/bbb-apps-akka/conf/application.conf \
     -template /usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml.tmpl:/usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml \
     /usr/bin/supervisord --nodaemon

mod/core/supervisord.conf

@@ -6,12 +6,3 @@ stdout_logfile=/dev/fd/1
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/fd/2
 stderr_logfile_maxbytes=0
-
-[program:bbb-apps-akka]
-command=/usr/local/bin/prefix-log /usr/share/bbb-apps-akka/bin/bbb-apps-akka
-user=bigbluebutton
-directory=/usr/share/bbb-apps-akka
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/fd/2
-stderr_logfile_maxbytes=0

mod/libreoffice/entrypoint.sh

@@ -8,7 +8,7 @@ for i in `seq 1 4` ; do
     chown bigbluebutton:bigbluebutton $SOFFICE_WORK_DIR
 
     # Initialize environment
-    su-exec bigbluebutton /usr/lib/libreoffice/program/soffice.bin -env:UserInstallation="file:///tmp/office_${i}/"
+    su-exec bigbluebutton /usr/lib/libreoffice/program/soffice.bin -env:UserInstallation="file:///tmp/office_${i}/" || true
 done