diff --git a/mod/bbb-pads/Dockerfile b/mod/bbb-pads/Dockerfile index 88ef640..3eaac9a 100644 --- a/mod/bbb-pads/Dockerfile +++ b/mod/bbb-pads/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14.18.1-bullseye-slim AS builder +FROM node:14.18.3-bullseye-slim AS builder COPY ./bbb-pads /bbb-pads RUN cd /bbb-pads && rm -r .git && npm install --production @@ -7,7 +7,7 @@ RUN cd /bbb-pads && rm -r .git && npm install --production RUN chmod 777 /bbb-pads/config # ------------------------------ -FROM node:14.18.1-bullseye-slim +FROM node:14.18.3-bullseye-slim RUN apt update && apt install -y jq moreutils \ && useradd --uid 2003 --user-group bbb-pads diff --git a/mod/bbb-pads/bbb-pads b/mod/bbb-pads/bbb-pads index c96715f..032931f 160000 --- a/mod/bbb-pads/bbb-pads +++ b/mod/bbb-pads/bbb-pads @@ -1 +1 @@ -Subproject commit c96715fe5258f1f0d4870ea0a885d04451b7a549 +Subproject commit 032931f916b42eed116dfc20eb153cfb0f487aeb diff --git a/mod/html5/Dockerfile b/mod/html5/Dockerfile index f5b2cce..bb9474d 100644 --- a/mod/html5/Dockerfile +++ b/mod/html5/Dockerfile @@ -21,7 +21,7 @@ RUN sed -i "s/VERSION/$TAG_HTML5/" /app/bundle/programs/web.browser/head.html \ # ------------------------------ -FROM node:14.18.1-alpine +FROM node:14.18.3-alpine RUN addgroup -g 2000 meteor && \ adduser -D -u 2001 -G meteor meteor && \ diff --git a/mod/nginx/bbb-playback b/mod/nginx/bbb-playback index 008f048..074a128 160000 --- a/mod/nginx/bbb-playback +++ b/mod/nginx/bbb-playback @@ -1 +1 @@ -Subproject commit 008f04847dda5d23d772d20d718d042d54803335 +Subproject commit 074a1289087a2da1744621a8374b17acea262903 diff --git a/mod/nginx/bbb/notes.nginx b/mod/nginx/bbb/notes.nginx index bcd2436..db04594 100644 --- a/mod/nginx/bbb/notes.nginx +++ b/mod/nginx/bbb/notes.nginx @@ -1,5 +1,9 @@ # https://github.com/ether/etherpad-lite/wiki/How-to-put-Etherpad-Lite-behind-a-reverse-Proxy location /pad/p/ { + # Avoid setting the user name from the embedded URL + if ($arg_userName) { + return 401; + } rewrite /pad/p/(.*) /p/$1 break; rewrite ^/pad/p$ /pad/p/ permanent; proxy_pass http://etherpad:9001/p; diff --git a/mod/nginx/bbb/podcast.nginx b/mod/nginx/bbb/podcast.nginx new file mode 100644 index 0000000..7d8c0a8 --- /dev/null +++ b/mod/nginx/bbb/podcast.nginx @@ -0,0 +1,22 @@ +# +# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/ +# +# Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below). +# +# This program is free software; you can redistribute it and/or modify it under the +# terms of the GNU Lesser General Public License as published by the Free Software +# Foundation; either version 3.0 of the License, or (at your option) any later +# version. +# +# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License along +# with BigBlueButton; if not, see . +# + + location /podcast { + root /var/bigbluebutton/published; + index index.html index.htm; + } \ No newline at end of file diff --git a/mod/recordings/Dockerfile b/mod/recordings/Dockerfile index f1b9c19..560f940 100644 --- a/mod/recordings/Dockerfile +++ b/mod/recordings/Dockerfile @@ -18,6 +18,7 @@ RUN apt-get update && apt-get install -y \ supervisor \ locales \ locales-all +# TODO: missing packages ENV LC_ALL en_US.UTF-8 ENV LANG en_US.UTF-8 @@ -79,11 +80,11 @@ RUN sed -i 's|Journald::Logger\.new.*|Logger.new("/var/log/bigbluebutton/recordi # add bbb-record with some adjustments so bbb-record works in this environment RUN cd /usr/bin \ - && wget https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/$TAG/bigbluebutton-config/bin/bbb-record \ + && wget https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/$TAG_RECORDINGS/bigbluebutton-config/bin/bbb-record \ && chmod +x /usr/bin/bbb-record \ && sed -i 's/^BBB_WEB.*/BBB_WEB=""/' /usr/bin/bbb-record \ && sed -i 's/systemctl.*//' /usr/bin/bbb-record \ - && echo "BIGBLUEBUTTON_RELEASE=$TAG" > /etc/bigbluebutton/bigbluebutton-release + && echo "BIGBLUEBUTTON_RELEASE=$TAG_RECORDINGS" > /etc/bigbluebutton/bigbluebutton-release # create user # the ID should match the one creating the files in `core` diff --git a/mod/webhooks/Dockerfile b/mod/webhooks/Dockerfile index 53e4a84..48b0e36 100644 --- a/mod/webhooks/Dockerfile +++ b/mod/webhooks/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14.18.1-bullseye-slim AS builder +FROM node:14.18.3-bullseye-slim AS builder RUN apt-get update && apt-get install -y git wget @@ -12,7 +12,7 @@ RUN cd /bbb-webhooks && npm install --production RUN chmod 777 /bbb-webhooks/config # ------------------------------ -FROM node:14.18.1-bullseye-slim +FROM node:14.18.3-bullseye-slim RUN useradd --uid 2004 --user-group bbb-webhooks COPY --from=builder /usr/bin/yq /usr/bin/yq diff --git a/mod/webrtc-sfu/Dockerfile b/mod/webrtc-sfu/Dockerfile index c01d937..474142a 100644 --- a/mod/webrtc-sfu/Dockerfile +++ b/mod/webrtc-sfu/Dockerfile @@ -23,7 +23,7 @@ RUN cd /app \ # ============================= -FROM node:14.18.1-bullseye-slim +FROM node:14.18.3-bullseye-slim RUN useradd --uid 2004 --user-group webrtc-sfu ENV NODE_ENV production diff --git a/tags.env b/tags.env index 77af3fe..f789cff 100644 --- a/tags.env +++ b/tags.env @@ -7,15 +7,16 @@ BBB_BUILD_TAG=v2022-03-30 # https://github.com/bigbluebutton/bigbluebutton -TAG_COMMON_MESSAGE=v2.5.0-alpha.6 -TAG_APPS_AKKA=v2.5.0-alpha.6 -TAG_FSESL_AKKA=v2.5.0-alpha.6 -TAG_BBB_WEB=v2.5.0-alpha.6 -TAG_HTML5=v2.5.0-alpha.6 -TAG_RECORDINGS=v2.5.0-alpha.6 +TAG_COMMON_MESSAGE=v2.5.0-beta.1 +TAG_APPS_AKKA=v2.5.0-beta.1 +TAG_FSESL_AKKA=v2.5.0-beta.1 +TAG_BBB_WEB=v2.5.0-beta.1 +TAG_HTML5=v2.5.0-beta.1 +TAG_RECORDINGS=v2.5.0-beta.1 -TAG_LEARNING_DASHBOARD=v2.5.0-alpha.6 -TAG_FS_CONFIG=v2.5.0-alpha.6 +TAG_LEARNING_DASHBOARD=v2.5.0-beta.1 +TAG_FS_CONFIG=v2.5.0-beta.1 -IMAGE_NODE=node:14.18.1-bullseye-slim \ No newline at end of file +IMAGE_NODE=node:14.18.3-bullseye-slim +# TODO: variable still unused \ No newline at end of file