From 1eca5e0c05c0ef8ec22f844568e80b5a8e124f93 Mon Sep 17 00:00:00 2001
From: chandi <git@chandi.it>
Date: Sun, 12 Jul 2020 15:30:16 +0200
Subject: [PATCH] extract fsesl-akka

---
 docker-compose.yml                            |  6 ++++++
 mod/core/Dockerfile                           |  3 +--
 mod/core/supervisord.conf                     |  9 --------
 mod/fsesl-akka/Dockerfile                     | 21 +++++++++++++++++++
 .../application.conf                          |  0
 5 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 mod/fsesl-akka/Dockerfile
 rename mod/{core/bbb-fsesl-akka => fsesl-akka}/application.conf (100%)

diff --git a/docker-compose.yml b/docker-compose.yml
index 98ea71e..4400a43 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -159,6 +159,12 @@ services:
       bbb-net:
         ipv4_address: 10.7.7.11
 
+  fsesl-akka:
+    build: mod/fsesl-akka
+    networks:
+      bbb-net:
+        ipv4_address: 10.7.7.14
+
   periodic:
     build: mod/periodic
     restart: unless-stopped
diff --git a/mod/core/Dockerfile b/mod/core/Dockerfile
index e657100..eb9f7de 100644
--- a/mod/core/Dockerfile
+++ b/mod/core/Dockerfile
@@ -36,7 +36,7 @@ RUN equivs-control redis-server.control \
 # rebuilding from here on if changed
 ENV VERSION v2.3-alpha-1
 
-RUN apt-get update && apt-get install -y bbb-web bbb-fsesl-akka bbb-apps-akka bbb-transcode-akka
+RUN apt-get update && apt-get install -y bbb-web bbb-apps-akka bbb-transcode-akka
 
 # add blank presentation files and allow conversation to pdf/svg
 RUN mkdir -p /usr/share/bigbluebutton/blank \
@@ -53,7 +53,6 @@ COPY web/bigbluebutton.properties /usr/share/bbb-web/WEB-INF/classes/bigbluebutt
 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 bbb-fsesl-akka/application.conf /etc/bbb-fsesl-akka/application.conf
 COPY bbb-transcode-akka/application.conf /etc/bbb-transcode-akka/application.conf
 COPY web-run.sh /usr/share/bbb-web/run-prod.sh
 
diff --git a/mod/core/supervisord.conf b/mod/core/supervisord.conf
index 9d7ce23..6e839c9 100644
--- a/mod/core/supervisord.conf
+++ b/mod/core/supervisord.conf
@@ -16,15 +16,6 @@ stdout_logfile_maxbytes=0
 stderr_logfile=/dev/fd/2
 stderr_logfile_maxbytes=0
 
-[program:bbb-fsesl-akka]
-command=/usr/local/bin/prefix-log /usr/share/bbb-fsesl-akka/bin/bbb-fsesl-akka
-user=bigbluebutton
-directory=/usr/share/bbb-fsesl-akka
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/fd/2
-stderr_logfile_maxbytes=0
-
 [program:bbb-transcode-akka]
 command=/usr/local/bin/prefix-log /usr/share/bbb-transcode-akka/bin/bbb-transcode-akka
 user=bigbluebutton
diff --git a/mod/fsesl-akka/Dockerfile b/mod/fsesl-akka/Dockerfile
new file mode 100644
index 0000000..a0acd9c
--- /dev/null
+++ b/mod/fsesl-akka/Dockerfile
@@ -0,0 +1,21 @@
+FROM openjdk:8u252-jdk-slim-buster
+
+RUN apt update && apt-get install -y subversion 
+
+ENV TAG v2.3-alpha-1
+
+
+RUN cd / \
+    && svn checkout https://github.com/alangecker/bbb-packages/tags/$TAG/bbb-fsesl-akka/data/usr/share/bbb-fsesl-akka \
+    && rm -r /bbb-fsesl-akka/.svn \
+    && groupadd -g 2003 fsesl \
+    && useradd -m -u 2003 -g fsesl fsesl \
+    && rm /bbb-fsesl-akka/logs \
+    && mkdir /bbb-fsesl-akka/logs \
+    && ln -s /dev/null /bbb-fsesl-akka/logs/bbb-fsesl-akka.log
+
+COPY application.conf /bbb-fsesl-akka/conf/application.conf
+
+USER fsesl
+WORKDIR /bbb-fsesl-akka
+CMD /bbb-fsesl-akka/bin/bbb-fsesl-akka
\ No newline at end of file
diff --git a/mod/core/bbb-fsesl-akka/application.conf b/mod/fsesl-akka/application.conf
similarity index 100%
rename from mod/core/bbb-fsesl-akka/application.conf
rename to mod/fsesl-akka/application.conf