From f8a83373b1298b749830d978b3f3eb9d24b90db7 Mon Sep 17 00:00:00 2001
From: cardinalit <cardinalit@protonmail.com>
Date: Wed, 16 Dec 2020 17:30:49 +0300
Subject: [PATCH 1/4] [*] Small changes, upd. gitignore

---
 .gitignore                | 12 ++++++++++++
 mod/recordings/Dockerfile |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 82d8eec..4eced3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,14 @@
+# IDEA generated
+.idea
+
+# OS generated
+.DS_Store
+.AppleDouble
+
+# Tmp files
+*.swp
+*.log
+
+# App generated
 .env
 postgres-data
diff --git a/mod/recordings/Dockerfile b/mod/recordings/Dockerfile
index 4f25704..4a1485d 100644
--- a/mod/recordings/Dockerfile
+++ b/mod/recordings/Dockerfile
@@ -73,7 +73,7 @@ RUN cd /usr/bin \
     && touch /var/log/bigbluebutton/bbb-web.log
 
 # create user
-# the ID should matcht the one creating the files in `core`
+# the ID should match the one creating the files in `core`
 RUN groupadd -g 998 bigbluebutton && useradd -m -u 998 -g bigbluebutton bigbluebutton
 
 COPY bigbluebutton.yml /usr/local/bigbluebutton/core/scripts/bigbluebutton.yml.tmpl

From 0b90a2024bd135f7096ad831ed69a81ad50564e8 Mon Sep 17 00:00:00 2001
From: cardinalit <cardinalit@protonmail.com>
Date: Wed, 16 Dec 2020 17:31:43 +0300
Subject: [PATCH 2/4] [*] Changed version of bbb for recordings config

---
 mod/recordings/bigbluebutton.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/recordings/bigbluebutton.yml b/mod/recordings/bigbluebutton.yml
index c20328a..78c7c10 100644
--- a/mod/recordings/bigbluebutton.yml
+++ b/mod/recordings/bigbluebutton.yml
@@ -1,4 +1,4 @@
-bbb_version: '2.2.23'
+bbb_version: '2.2.30'
 raw_audio_src: /var/freeswitch/meetings
 raw_video_src: /usr/share/red5/webapps/video/streams
 kurento_video_src: /var/kurento/recordings

From 4854bce49ac81b73cb9c63c987027f27308ded4c Mon Sep 17 00:00:00 2001
From: cardinalit <cardinalit@protonmail.com>
Date: Wed, 16 Dec 2020 17:38:09 +0300
Subject: [PATCH 3/4] =?UTF-8?q?[*]=20Fixed=20iss#63=20=E2=80=94=20Unable?=
 =?UTF-8?q?=20to=20delete=20recording?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mod/recordings/Dockerfile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/mod/recordings/Dockerfile b/mod/recordings/Dockerfile
index 4a1485d..e7f2e13 100644
--- a/mod/recordings/Dockerfile
+++ b/mod/recordings/Dockerfile
@@ -75,10 +75,17 @@ RUN cd /usr/bin \
 # create user
 # the ID should match the one creating the files in `core`
 RUN groupadd -g 998 bigbluebutton && useradd -m -u 998 -g bigbluebutton bigbluebutton
+# change owner
+# https://github.com/alangecker/bigbluebutton-docker/issues/63
+RUN chown -R 998:998 /usr/local/bigbluebutton /var/log/bigbluebutton
 
 COPY bigbluebutton.yml /usr/local/bigbluebutton/core/scripts/bigbluebutton.yml.tmpl
 ADD log-collector.py /log-collector.py
 ADD entrypoint.sh /entrypoint.sh
+
+# change user before entrypoint
+USER bigbluebutton
+
 ENTRYPOINT dockerize \
     -template /usr/local/bigbluebutton/core/scripts/bigbluebutton.yml.tmpl:/usr/local/bigbluebutton/core/scripts/bigbluebutton.yml \
     /entrypoint.sh
\ No newline at end of file

From 151dc01a29d932bcddd656148db42c9aa0a4b383 Mon Sep 17 00:00:00 2001
From: cardinalit <cardinalit@protonmail.com>
Date: Wed, 16 Dec 2020 17:48:45 +0300
Subject: [PATCH 4/4] [*] Small changes

---
 mod/recordings/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mod/recordings/Dockerfile b/mod/recordings/Dockerfile
index e7f2e13..36fa86f 100644
--- a/mod/recordings/Dockerfile
+++ b/mod/recordings/Dockerfile
@@ -84,6 +84,7 @@ ADD log-collector.py /log-collector.py
 ADD entrypoint.sh /entrypoint.sh
 
 # change user before entrypoint
+# to set user rights for all generated videos
 USER bigbluebutton
 
 ENTRYPOINT dockerize \