From fbc88a947eeb4f32b308bbb0c590faf5139db76d Mon Sep 17 00:00:00 2001 From: chandi Date: Tue, 27 Oct 2020 19:55:43 +0100 Subject: [PATCH] extract apps-akka from core --- docker-compose.yml | 12 ++++++++ mod/apps-akka/Dockerfile | 28 +++++++++++++++++++ .../application.conf | 0 mod/core/Dockerfile | 3 +- mod/core/entrypoint.sh | 1 - mod/core/supervisord.conf | 9 ------ mod/libreoffice/entrypoint.sh | 2 +- 7 files changed, 42 insertions(+), 13 deletions(-) create mode 100644 mod/apps-akka/Dockerfile rename mod/{core/bbb-apps-akka => apps-akka}/application.conf (100%) diff --git a/docker-compose.yml b/docker-compose.yml index 62088ee..9cd3d2f 100644 --- a/docker-compose.yml +++ b/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 diff --git a/mod/apps-akka/Dockerfile b/mod/apps-akka/Dockerfile new file mode 100644 index 0000000..59dabc0 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/mod/core/bbb-apps-akka/application.conf b/mod/apps-akka/application.conf similarity index 100% rename from mod/core/bbb-apps-akka/application.conf rename to mod/apps-akka/application.conf diff --git a/mod/core/Dockerfile b/mod/core/Dockerfile index 5e07172..99f5c22 100644 --- a/mod/core/Dockerfile +++ b/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 diff --git a/mod/core/entrypoint.sh b/mod/core/entrypoint.sh index ac2585d..a2f6e2b 100755 --- a/mod/core/entrypoint.sh +++ b/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 diff --git a/mod/core/supervisord.conf b/mod/core/supervisord.conf index 54eb005..b6868c9 100644 --- a/mod/core/supervisord.conf +++ b/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 diff --git a/mod/libreoffice/entrypoint.sh b/mod/libreoffice/entrypoint.sh index b19e7e2..60767f6 100755 --- a/mod/libreoffice/entrypoint.sh +++ b/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