From 9a85b0bfc6d1b5f4129a933d450f3fb780590095 Mon Sep 17 00:00:00 2001
From: Lincoln W <41193328+lincolnthedev@users.noreply.github.com>
Date: Wed, 28 Jul 2021 18:32:42 -0400
Subject: [PATCH 1/8] Fixed some typos

---
 scripts/setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/setup b/scripts/setup
index fb32153..6cc637b 100755
--- a/scripts/setup
+++ b/scripts/setup
@@ -64,8 +64,8 @@ recording=""
 echo "Should the recording feature be included?"
 echo "   IMPORTANT: this is currently a big privacy issues, because it will "
 echo "   record everything which happens in the conference, even when the button"
-echo "   suggets, that it does not."
-echo "   make sure that you awalys get peoples consent, before they join a room!"
+echo "   suggests, that it does not."
+echo "   make sure that you always get people's consent, before they join a room!"
 echo "   https://github.com/bigbluebutton/bigbluebutton/issues/9202"
 while [[ ! $recording =~ ^(y|n)$ ]]; do
 

From add48f9418148c4bce4ef3a6a0642d353fd1f699 Mon Sep 17 00:00:00 2001
From: Mostafa Ghadamyari <m.ghadam@gmail.com>
Date: Mon, 2 Aug 2021 18:35:22 +0430
Subject: [PATCH 2/8] fixed sed delimiter for CERTPATH and KEYPATH

need to use another delimiter rather than `/` since the $CERTPATH and $KEYPATH variables contain `/` in the full path and cause the following error
```
`sed: -e expression #1, char 50: unknown option to `s'
```
---
 scripts/setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/setup b/scripts/setup
index fb32153..8b7b859 100755
--- a/scripts/setup
+++ b/scripts/setup
@@ -136,8 +136,8 @@ fi
 
 if [ -n "$CERTPATH" ] && [ -n "$KEYPATH" ]
 then
-    sed -i "s/#COTURN_TLS_CERT_PATH=.*/COTURN_TLS_CERT_PATH=$CERTPATH/" .env
-    sed -i "s/#COTURN_TLS_KEY_PATH=.*/COTURN_TLS_KEY_PATH=$KEYPATH/" .env
+    sed -i "s,#COTURN_TLS_CERT_PATH=.*,COTURN_TLS_CERT_PATH=$CERTPATH," .env
+    sed -i "s,#COTURN_TLS_KEY_PATH=.*,COTURN_TLS_KEY_PATH=$KEYPATH," .env
 fi
 
 if [ "$prometheus_exporter" == "y" ]

From 69b54657f3423cdd8c9cffaeab5e265fcbb8b98a Mon Sep 17 00:00:00 2001
From: Mostafa Ghadamyari <m.ghadam@gmail.com>
Date: Mon, 2 Aug 2021 19:54:48 +0430
Subject: [PATCH 3/8] updated wget to not use proxies

Unfortunately, docker-compose does not respect noProxy hosts defined in ~/.docker/config.json or /etc/systemd/system/docker.service.d/http-proxy.conf and always uses proxy for healthcheck which causes problems. Resolved this by updating wget to not use proxies when checking for bbb-web health.
---
 docker-compose.tmpl.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.tmpl.yml b/docker-compose.tmpl.yml
index 2e86700..0bc25ff 100644
--- a/docker-compose.tmpl.yml
+++ b/docker-compose.tmpl.yml
@@ -44,7 +44,7 @@ services:
     depends_on:
         - redis
     healthcheck:
-      test: wget --no-verbose --tries=1 --spider http://10.7.7.2:8090/bigbluebutton/api || exit 1
+      test: wget --no-proxy --no-verbose --tries=1 --spider http://10.7.7.2:8090/bigbluebutton/api || exit 1
       start_period: 2m
     environment:
       DEV_MODE: ${DEV_MODE:-}

From 681f880669c7ee39a81ada30d7f2c1fd7d1d3ada Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@alpinelinux.org>
Date: Wed, 4 Aug 2021 10:56:57 +0200
Subject: [PATCH 4/8] coturn: expose ENABLE_HTTPS_PROXY env variable

The coturn entrypoint checks if ENABLE_HTTPS_PROXY is set but it was not
added the the compose environment stanza so it was never set in the
container.
---
 docker-compose.tmpl.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.tmpl.yml b/docker-compose.tmpl.yml
index 2e86700..6e2bc97 100644
--- a/docker-compose.tmpl.yml
+++ b/docker-compose.tmpl.yml
@@ -337,6 +337,8 @@ services:
       {{end}}
       - ./mod/coturn/entrypoint.sh:/usr/local/bin/docker-entrypoint.sh
       - ./mod/coturn/turnserver.conf:/etc/coturn/turnserver.conf
+    environment:
+      ENABLE_HTTPS_PROXY:
     network_mode: host
 {{end}}
 

From e1238f13d675af901fbc06b87a1fb44cb4cad807 Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@alpinelinux.org>
Date: Wed, 4 Aug 2021 11:03:53 +0200
Subject: [PATCH 5/8] https_proxy: fix setting of ALLOWED_DOMAINS

The template is not correctly checking if DEV_MODE is set to true.
This will always set ALLOWED_DOMAINS to an empty string and allowing to
generate certificates for any domain that points to the application.
---
 docker-compose.tmpl.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose.tmpl.yml b/docker-compose.tmpl.yml
index 2e86700..29add07 100644
--- a/docker-compose.tmpl.yml
+++ b/docker-compose.tmpl.yml
@@ -311,10 +311,10 @@ services:
       - ./mod/https/site-ipv4only.conf:/etc/nginx/conf.d/bbb-docker.conf
     {{end}}
     environment:
-      {{ if not .Env.DEV_MODE }}
-      ALLOWED_DOMAINS: ${DOMAIN}
-      {{else}}
+      {{ if isTrue .Env.DEV_MODE }}
       ALLOWED_DOMAINS: ""
+      {{else}}
+      ALLOWED_DOMAINS: ${DOMAIN}
       {{end}}
     network_mode: host
 {{end}}

From 92c09712f50eb05c502826291c048ddc67ec28fd Mon Sep 17 00:00:00 2001
From: criadoperez <alejandro@criadoperez.com>
Date: Tue, 14 Sep 2021 17:37:36 +0200
Subject: [PATCH 6/8] fixed broken link

---
 docs/behind-nat.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/behind-nat.md b/docs/behind-nat.md
index 3453aad..3a8d1e6 100644
--- a/docs/behind-nat.md
+++ b/docs/behind-nat.md
@@ -10,5 +10,5 @@ $ ip addr add 144.76.97.34/32 dev ens3
 Specific to your linux distribution. Use a search engine of your choice. ;)
 
 ## Ports
-Also don't forget to forward all necassary ports listed in http://docs.bigbluebutton.org/2.2/configure-firewall.html
+Also don't forget to forward all necassary ports listed in https://docs.bigbluebutton.org/admin/configure-firewall.html
 

From 3da6bc1d3467cc7590bde32afaa661cc59333d7e Mon Sep 17 00:00:00 2001
From: chandi <git@chandi.it>
Date: Tue, 5 Oct 2021 16:48:22 +0200
Subject: [PATCH 7/8] changes for v2.3.14

---
 mod/apps-akka/Dockerfile      |  4 ++--
 mod/bbb-web/Dockerfile        |  6 +++---
 mod/fsesl-akka/Dockerfile     |  6 +++---
 mod/html5/Dockerfile          |  5 +++--
 mod/html5/settings.yml        | 23 ++++++++++++++++++++---
 mod/nginx/Dockerfile          |  2 +-
 mod/nginx/bbb/notes.nginx     |  6 ++++--
 mod/recordings/Dockerfile     |  2 +-
 mod/webrtc-sfu/bbb-webrtc-sfu |  2 +-
 sample.env                    |  6 +++---
 10 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/mod/apps-akka/Dockerfile b/mod/apps-akka/Dockerfile
index 1d7c2d6..8835ef7 100644
--- a/mod/apps-akka/Dockerfile
+++ b/mod/apps-akka/Dockerfile
@@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder
 RUN apt-get update && apt-get install -y subversion
 
 # download bbb-common-message
-ENV TAG_COMMON_MESSAGE v2.3.4
+ENV TAG_COMMON_MESSAGE v2.3.14
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
     && rm -rf /bbb-common-message/.svn
 
@@ -14,7 +14,7 @@ RUN cd /bbb-common-message \
 
 # ===================================================
 
-ENV TAG v2.3.4
+ENV TAG v2.3.14
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-apps /source \
     && rm -rf /source/.svn
 
diff --git a/mod/bbb-web/Dockerfile b/mod/bbb-web/Dockerfile
index 33a22bd..ea71da5 100644
--- a/mod/bbb-web/Dockerfile
+++ b/mod/bbb-web/Dockerfile
@@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder
 RUN apt-get update && apt-get install -y subversion
 
 # download bbb-common-message
-ENV TAG_COMMON_MESSAGE v2.3.4
+ENV TAG_COMMON_MESSAGE v2.3.14
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
     && rm -rf /bbb-common-message/.svn
 
@@ -26,7 +26,7 @@ RUN cd /opt \
 ENV PATH="/opt/gradle-6.7/bin:${PATH}"
 
 # download bbb-common-web
-ENV TAG_COMMON_WEB v2.3.4
+ENV TAG_COMMON_WEB v2.3.14
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_WEB/bbb-common-web /bbb-common-web \
     && rm -rf /bbb-common-message/.svn
 
@@ -35,7 +35,7 @@ RUN cd /bbb-common-web \
  && ./deploy.sh
 
 # download bbb-web
-ENV TAG_WEB v2.3.4
+ENV TAG_WEB v2.3.14
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_WEB/bigbluebutton-web /bbb-web \
     && rm -rf /bbb-web/.svn
 
diff --git a/mod/fsesl-akka/Dockerfile b/mod/fsesl-akka/Dockerfile
index 726d7ea..bace1ea 100644
--- a/mod/fsesl-akka/Dockerfile
+++ b/mod/fsesl-akka/Dockerfile
@@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder
 RUN apt-get update && apt-get install -y subversion
 
 # download bbb-common-message
-ENV TAG_COMMON_MESSAGE v2.3.4
+ENV TAG_COMMON_MESSAGE v2.3.14
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
     && rm -rf /bbb-common-message/.svn
 
@@ -13,7 +13,7 @@ RUN cd /bbb-common-message \
 
 
 # ===================================================
-ENV TAG_FSESL v2.3.4
+ENV TAG_FSESL v2.3.14
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_FSESL/bbb-fsesl-client /bbb-fsesl-client \
     && rm -rf /bbb-fsesl-client/.svn
 
@@ -21,7 +21,7 @@ RUN cd /bbb-fsesl-client \
     && ./deploy.sh
 
 
-ENV TAG v2.3.4
+ENV TAG v2.3.14
 RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-fsesl /source \
     && rm -rf /source/.svn
 
diff --git a/mod/html5/Dockerfile b/mod/html5/Dockerfile
index 9189355..cbb78d1 100644
--- a/mod/html5/Dockerfile
+++ b/mod/html5/Dockerfile
@@ -14,12 +14,13 @@ USER meteor
 ENV METEOR_VERSION 1.10.2
 RUN curl -sL https://install.meteor.com?release=$METEOR_VERSION | sed s/--progress-bar/-sL/g | /bin/sh
 
-ENV TAG v2.3.4
+ENV TAG v2.3.14
 RUN cd ~ \
     && svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \
     && mv ~/bigbluebutton-html5 ~/source \
     && cd ~/source \
     && ~/.meteor/meteor npm install --production \
+    && npm rebuild node-sass \
     && METEOR_DISABLE_OPTIMISTIC_CACHING=1  ~/.meteor/meteor build --directory ~/app \
     && rm -rf ~/source
 
@@ -41,4 +42,4 @@ COPY settings.yml /app/programs/server/assets/app/config/settings.yml.tmpl
 ENTRYPOINT ["/entrypoint.sh"]
 
 # lets set the tag again, so that it is include in the image for later version retrieval
-ENV TAG v2.3.4
+ENV TAG v2.3.14
diff --git a/mod/html5/settings.yml b/mod/html5/settings.yml
index 0831649..a05e340 100644
--- a/mod/html5/settings.yml
+++ b/mod/html5/settings.yml
@@ -28,13 +28,15 @@ public:
     #
     clientTitle: {{ .Env.CLIENT_TITLE }}
     appName: BigBlueButton HTML5 Client
-    bbbServerVersion: 2.3-dev-docker
+    bbbServerVersion: 2.3-docker
     copyright: '©2021 BigBlueButton Inc.'
-    html5ClientBuild: "1783-docker"
+    html5ClientBuild: "1845-docker"
     helpLink: https://bigbluebutton.org/html5/
     lockOnJoin: true
     cdn: ''
     basename: '/html5client'
+    # Use https URL of CSS file. Example: https://docs.bigbluebutton.org/admin/customize.html#examples
+    customStyleUrl: null
     askForFeedbackOnLogout: false
     # the default logoutUrl matches window.location.origin i.e. bigbluebutton.org for demo.bigbluebutton.org
     # in some cases we want only custom logoutUrl to be used when provided on meeting create. Default value: true
@@ -79,6 +81,21 @@ public:
     showAudioFilters: true
     raiseHandActionButton:
       enabled: true
+    # If enabled, before joining microphone the client will perform a trickle
+    # ICE against Kurento and use the information about successfull
+    # candidate-pairs to filter out local candidates in SIP.js's SDP.
+    # Try enabling this setting in scenarios where the listenonly mode works,
+    # but microphone doesn't (for example, when using VPN).
+    # For compatibility check "Browser compatbility" section in:
+    # https://developer.mozilla.org/en-US/docs/Web/API/RTCDtlsTransport/iceTransport
+    # This is an EXPERIMENTAL setting and the default value is false
+    # experimentalUseKmsTrickleIceForMicrophone: false
+    #
+    # Shows stats about download and upload rates, audio jitter, lost packets
+    # and turn information
+    enableNetworkStats: false
+    # Enable the button to allow users to copy network stats to clipboard
+    enableCopyNetworkStatsButton: false
     defaultSettings:
       application:
         animations: true
@@ -379,7 +396,7 @@ public:
     toggleSelfVoice: false
   poll:
     enabled: true
-    max_custom: 5
+    maxCustom: 5
     allowDragAndDropFile: false
     maxTypedAnswerLength: 45
   captions:
diff --git a/mod/nginx/Dockerfile b/mod/nginx/Dockerfile
index f0ba87b..6a0e23a 100644
--- a/mod/nginx/Dockerfile
+++ b/mod/nginx/Dockerfile
@@ -4,7 +4,7 @@ RUN apk add subversion git
 
 # --------------------
 
-ENV TAG_PLAYBACK v2.3.2
+ENV TAG_PLAYBACK v3.1.0
 ENV REACT_APP_BBB_PLAYBACK_BUILD=$TAG_PLAYBACK
 
 # apparently there is currently no github release & tag created
diff --git a/mod/nginx/bbb/notes.nginx b/mod/nginx/bbb/notes.nginx
index 0bd5da2..7fe3945 100644
--- a/mod/nginx/bbb/notes.nginx
+++ b/mod/nginx/bbb/notes.nginx
@@ -49,8 +49,10 @@ location /pad/socket.io {
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "Upgrade";
 
-    auth_request /bigbluebutton/connection/checkAuthorization;
-    auth_request_set $auth_status $upstream_status;
+    # this is currently broken
+    # TODO: fix & reenable
+    #auth_request /bigbluebutton/connection/checkAuthorization;
+    #auth_request_set $auth_status $upstream_status;
 }
 
 location /static {
diff --git a/mod/recordings/Dockerfile b/mod/recordings/Dockerfile
index 992fe79..c91e8aa 100644
--- a/mod/recordings/Dockerfile
+++ b/mod/recordings/Dockerfile
@@ -45,7 +45,7 @@ RUN mkdir -p \
     /usr/local/bigbluebutton/core \
     /etc/bigbluebutton
 
-ENV TAG v2.3.4
+ENV TAG v2.3.14
 
 # add bbb-record-core (lib, scripts and Gemfile)
 RUN cd /usr/local/bigbluebutton/core \
diff --git a/mod/webrtc-sfu/bbb-webrtc-sfu b/mod/webrtc-sfu/bbb-webrtc-sfu
index 1f82c24..4f10ca8 160000
--- a/mod/webrtc-sfu/bbb-webrtc-sfu
+++ b/mod/webrtc-sfu/bbb-webrtc-sfu
@@ -1 +1 @@
-Subproject commit 1f82c241a6383c811c73871224e6f4670b5e45c4
+Subproject commit 4f10ca89ee638d78fee364e3932f80ed5cc7496b
diff --git a/sample.env b/sample.env
index cac5f13..fe507bb 100644
--- a/sample.env
+++ b/sample.env
@@ -84,11 +84,11 @@ SIP_IP_ALLOWLIST=
 CLIENT_TITLE=BigBlueButton
 
 # use following lines to replace the default welcome message and footer
-WELCOME_MESSAGE=Welcome to <b>%%CONFNAME%%</b>!<br><br>For help on using BigBlueButton see these (short) <a href="https://www.bigbluebutton.org/html5" target="_blank"><u>tutorial videos</u></a>.<br><br>To join the audio bridge click the phone button.  Use a headset to avoid causing background noise for others.
-WELCOME_FOOTER=This server is running <a href="https://docs.bigbluebutton.org/" target="_blank"><u>BigBlueButton</u></a>.
+WELCOME_MESSAGE="Welcome to <b>%%CONFNAME%%</b>!<br><br>For help on using BigBlueButton see these (short) <a href='https://www.bigbluebutton.org/html5' target='_blank'><u>tutorial videos</u></a>.<br><br>To join the audio bridge click the phone button.  Use a headset to avoid causing background noise for others."
+WELCOME_FOOTER="This server is running <a href='https://docs.bigbluebutton.org/'' target='_blank'><u>BigBlueButton</u></a>."
 
 # use following line for an additional SIP dial-in message
-#WELCOME_FOOTER=This server is running <a href="https://docs.bigbluebutton.org/" target="_blank"><u>BigBlueButton</u></a>. <br><br>To join this meeting by phone, dial:<br>  INSERT_YOUR_PHONE_NUMBER_HERE<br>Then enter %%CONFNUM%% as the conference PIN number.
+#WELCOME_FOOTER="This server is running <a href='https://docs.bigbluebutton.org/' target='_blank'><u>BigBlueButton</u></a>. <br><br>To join this meeting by phone, dial:<br>  INSERT_YOUR_PHONE_NUMBER_HERE<br>Then enter %%CONFNUM%% as the conference PIN number."
 
 # for a different default presentation, place the pdf file in ./conf/ and
 # adjust the following path

From 4a6904dd0dbed40b82150f434c13aa41ef8c4487 Mon Sep 17 00:00:00 2001
From: chandi <git@chandi.it>
Date: Tue, 5 Oct 2021 16:54:19 +0200
Subject: [PATCH 8/8] Release v2.3.14-1

---
 CHANGELOG.md | 7 +++++++
 README.md    | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1e64d5..2072775 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## Release v2.3.14-1 (2021-10-06)
+- Applied changes v2.3.5-v2.3.14 @alangecker
+- updated wget to not use proxies [#143](https://github.com/bigbluebutton/docker/pull/143) @mghadam
+- fixed sed delimiter for CERTPATH and KEYPATH [#144](https://github.com/bigbluebutton/docker/pull/144) @mghadam
+- https_proxy: fix setting of ALLOWED_DOMAINS [#145](https://github.com/bigbluebutton/docker/pull/145) @clandmeter
+- coturn: expose ENABLE_HTTPS_PROXY env variable [#146](https://github.com/bigbluebutton/docker/pull/146) [#156](https://github.com/bigbluebutton/docker/pull/156) @clandmeter @omidmaldar
+
 ## Release v2.3.4-1 (2021-06-22) #131
 - Applied v2.3.4 changes [#130](https://github.com/bigbluebutton/docker/pull/130) @alangecker 
 - Reintegrate turn with default ports and support for external certificates [#126](https://github.com/bigbluebutton/docker/pull/126) @cjhille
diff --git a/README.md b/README.md
index 06eaf13..8eb93c0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # 📦 BigBlueButton 2.3 Docker
 
-Version: 2.3.4 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues)
+Version: 2.3.14 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues)
 
 ## Features
 - Easy installation