From 954100d55ed5469e725b3388e2c624aa949d129e Mon Sep 17 00:00:00 2001 From: chandi Date: Wed, 13 Sep 2023 01:30:05 +0200 Subject: [PATCH 1/5] html5: fix display of version --- mod/html5/Dockerfile | 4 ++++ mod/html5/bbb-html5.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/mod/html5/Dockerfile b/mod/html5/Dockerfile index a542d3d..bbae5c0 100644 --- a/mod/html5/Dockerfile +++ b/mod/html5/Dockerfile @@ -37,4 +37,8 @@ COPY --from=builder --chown=meteor:meteor /app/bundle /app COPY entrypoint.sh /entrypoint.sh COPY bbb-html5.yml /app/bbb-html5.yml.tmpl +# expose TAG_HTML5 in container for the version display +ARG TAG_HTML5 +ENV TAG_HTML5 $TAG_HTML5 + ENTRYPOINT ["/entrypoint.sh"] diff --git a/mod/html5/bbb-html5.yml b/mod/html5/bbb-html5.yml index baf6de8..17db535 100644 --- a/mod/html5/bbb-html5.yml +++ b/mod/html5/bbb-html5.yml @@ -1,5 +1,6 @@ public: app: + html5ClientBuild: {{ .Env.TAG_HTML5 }} bbbServerVersion: {{ .Env.TAG_HTML5 }}-docker listenOnlyMode: {{ .Env.LISTEN_ONLY_MODE }} skipCheck: {{ .Env.DISABLE_ECHO_TEST }} From f3ae0f1fd2b3493746c14ac6c53ea75a2673eedf Mon Sep 17 00:00:00 2001 From: chandi Date: Tue, 28 Nov 2023 15:30:29 +0100 Subject: [PATCH 2/5] v2.7.3 --- CHANGELOG.md | 1 + README.md | 2 +- mod/bbb-pads/bbb-pads | 2 +- mod/etherpad/Dockerfile | 2 +- mod/nginx/bbb-playback | 2 +- mod/webhooks/bbb-webhooks | 2 +- mod/webrtc-sfu/bbb-webrtc-sfu | 2 +- tags.env | 20 ++++++++++---------- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a1d0ef..a553f09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog ## Unreleased +- BigBlueButton 2.7.3 @alangecker ## Release v2.7.0 (2023-09) diff --git a/README.md b/README.md index c53d6f1..360c1f3 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ # 📦 BigBlueButton 2.7 Docker -Version: 2.7.0 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues) +Version: 2.7.3 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues) ## Features - Easy installation diff --git a/mod/bbb-pads/bbb-pads b/mod/bbb-pads/bbb-pads index 8909b72..433fe4c 160000 --- a/mod/bbb-pads/bbb-pads +++ b/mod/bbb-pads/bbb-pads @@ -1 +1 @@ -Subproject commit 8909b728c0d427226b05523915f8f1e03e58eb13 +Subproject commit 433fe4c3934edff36cddcfb1e892e323c2fe75ea diff --git a/mod/etherpad/Dockerfile b/mod/etherpad/Dockerfile index fb455cc..22c958f 100644 --- a/mod/etherpad/Dockerfile +++ b/mod/etherpad/Dockerfile @@ -1,4 +1,4 @@ -FROM etherpad/etherpad:1.9.1 +FROM etherpad/etherpad:1.9.4 USER root diff --git a/mod/nginx/bbb-playback b/mod/nginx/bbb-playback index 134315b..a8f5a72 160000 --- a/mod/nginx/bbb-playback +++ b/mod/nginx/bbb-playback @@ -1 +1 @@ -Subproject commit 134315bc6fa9a263b72be3b33dc64e5124363947 +Subproject commit a8f5a72a7dc55cc8bab6f980035291b6e8fe5de5 diff --git a/mod/webhooks/bbb-webhooks b/mod/webhooks/bbb-webhooks index 2eb5e44..7c0cd8e 160000 --- a/mod/webhooks/bbb-webhooks +++ b/mod/webhooks/bbb-webhooks @@ -1 +1 @@ -Subproject commit 2eb5e4471083f9f99e969d5d19a44529ec735808 +Subproject commit 7c0cd8e6cad144578598f9fa6ea2d9ab78af560b diff --git a/mod/webrtc-sfu/bbb-webrtc-sfu b/mod/webrtc-sfu/bbb-webrtc-sfu index 47ad89c..c0de0ff 160000 --- a/mod/webrtc-sfu/bbb-webrtc-sfu +++ b/mod/webrtc-sfu/bbb-webrtc-sfu @@ -1 +1 @@ -Subproject commit 47ad89c6c6d11bccb3172d3341f5b36386d272f5 +Subproject commit c0de0ff3857146da4924233d36b710874d16a26f diff --git a/tags.env b/tags.env index e74d80c..136820a 100644 --- a/tags.env +++ b/tags.env @@ -8,24 +8,24 @@ BBB_BUILD_TAG=bbb27-2023-06-13-java17 # https://github.com/bigbluebutton/bigbluebutton TAG_COMMON_MESSAGE=v2.7.0 -TAG_APPS_AKKA=v2.7.0 +TAG_APPS_AKKA=v2.7.3 TAG_FSESL_AKKA=v2.7.0 -TAG_BBB_WEB=v2.7.0 -TAG_HTML5=v2.7.0 +TAG_BBB_WEB=v2.7.3 +TAG_HTML5=v2.7.3 TAG_RECORDINGS=v2.7.0 -TAG_LEARNING_DASHBOARD=v2.7.0 -TAG_BBB_PRESENTATION_VIDEO=4.0.3 +TAG_LEARNING_DASHBOARD=v2.7.3 +TAG_BBB_PRESENTATION_VIDEO=4.0.4 TAG_FS_CONFIG=v2.7.0 TAG_FS_BUILD_FILES=v2.7.0 TAG_FREESWITCH=v1.10.10 -TAG_GREENLIGHT=v3.0.6.1 +TAG_GREENLIGHT=v3.1.0 # individual git submodules # use `./scripts/checkout-submodules` to ensure, that the submodules # match the provided tags here -TAG_WEBRTC_SFU=v2.11.0 -TAG_WEBHOOKS=v2.6.0 -TAG_PLAYBACK=v5.0.0 -TAG_PADS=v1.5.1 +TAG_WEBRTC_SFU=v2.12.0 +TAG_WEBHOOKS=v2.6.1 +TAG_PLAYBACK=v5.0.2 +TAG_PADS=v1.5.2 From f8ffbcd31b09d3e9ed2f411a5d4c8ce045cf4895 Mon Sep 17 00:00:00 2001 From: chandi Date: Tue, 28 Nov 2023 15:30:55 +0100 Subject: [PATCH 3/5] fix missing URL in recording container --- mod/recordings/bbb-web.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/recordings/bbb-web.properties b/mod/recordings/bbb-web.properties index c36b7e6..e891d1c 100644 --- a/mod/recordings/bbb-web.properties +++ b/mod/recordings/bbb-web.properties @@ -1 +1,2 @@ +bigbluebutton.web.serverURL=https://{{ .Env.DOMAIN }} securitySalt={{ .Env.SHARED_SECRET }} \ No newline at end of file From 00322d156c9c93c0efc5f9f4174db1f32ad23e48 Mon Sep 17 00:00:00 2001 From: chandi Date: Tue, 28 Nov 2023 15:31:19 +0100 Subject: [PATCH 4/5] switch to up-to-date jodconverter container --- mod/jodconverter/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/jodconverter/Dockerfile b/mod/jodconverter/Dockerfile index fdbab6f..8ae7e27 100644 --- a/mod/jodconverter/Dockerfile +++ b/mod/jodconverter/Dockerfile @@ -1,6 +1,6 @@ -FROM eugenmayer/jodconverter:rest +FROM ghcr.io/jodconverter/jodconverter-examples:rest RUN echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections -RUN sed -i 's/main/main contrib/' /etc/apt/sources.list && apt-get update +RUN sed -i 's/main/main contrib/' /etc/apt/sources.list.d/debian.sources && apt-get update RUN apt-get update && apt -y install --no-install-recommends \ fonts-arkpandora \ fonts-crosextra-carlito \ From 22b80c2d03e9dffc54e7db901ceb5b55e921398f Mon Sep 17 00:00:00 2001 From: chandi Date: Tue, 28 Nov 2023 15:31:31 +0100 Subject: [PATCH 5/5] update libopusenc --- mod/freeswitch/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/freeswitch/Dockerfile b/mod/freeswitch/Dockerfile index 280f6a9..0fef30f 100644 --- a/mod/freeswitch/Dockerfile +++ b/mod/freeswitch/Dockerfile @@ -66,9 +66,9 @@ RUN apt-get update && \ libfreetype6 libcurl4 libspeex1 libspeexdsp1 libopus0 libsndfile1 libopusfile0 liblua5.2-0 libjbig0 libldns2 libedit2 libtiff5 libpng16-16 \ && \ # install libopusenc0 - wget -O /tmp/libopusenc0_0.2.1-1bbb1_amd64.deb https://launchpad.net/~bigbluebutton/+archive/ubuntu/support/+files/libopusenc0_0.2.1-1bbb1_amd64.deb \ - && dpkg -i /tmp/libopusenc0_0.2.1-1bbb1_amd64.deb \ - && rm /tmp/libopusenc0_0.2.1-1bbb1_amd64.deb + wget -O /tmp/libopusenc0_0.2.1-1bbb2_amd64.deb https://launchpad.net/~bigbluebutton/+archive/ubuntu/support/+files/libopusenc0_0.2.1-1bbb2_amd64.deb \ + && dpkg -i /tmp/libopusenc0_0.2.1-1bbb2_amd64.deb \ + && rm /tmp/libopusenc0_0.2.1-1bbb2_amd64.deb # add dockerize COPY --from=alangecker/bbb-docker-base-java /usr/local/bin/dockerize /usr/local/bin/dockerize