diff --git a/docker-compose.tmpl.yml b/docker-compose.tmpl.yml index b570a60..b5dc450 100644 --- a/docker-compose.tmpl.yml +++ b/docker-compose.tmpl.yml @@ -244,6 +244,8 @@ services: MS_RTP_LISTEN_IP: '{"ip":"0.0.0.0", "announcedIp":"${EXTERNAL_IPv4}"}' volumes: - vol-mediasoup:/var/mediasoup + tmpfs: + - /var/log/bbb-webrtc-sfu network_mode: host fsesl-akka: diff --git a/mod/bbb-pads/Dockerfile b/mod/bbb-pads/Dockerfile index 3eaac9a..fdabe95 100644 --- a/mod/bbb-pads/Dockerfile +++ b/mod/bbb-pads/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14.18.3-bullseye-slim AS builder +FROM node:14.19.1-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.3-bullseye-slim +FROM node:14.19.1-bullseye-slim RUN apt update && apt install -y jq moreutils \ && useradd --uid 2003 --user-group bbb-pads diff --git a/mod/freeswitch/Dockerfile b/mod/freeswitch/Dockerfile index 107b8d5..a3f05ba 100644 --- a/mod/freeswitch/Dockerfile +++ b/mod/freeswitch/Dockerfile @@ -5,11 +5,7 @@ RUN apt-get update && \ apt-get install -y --no-install-recommends \ subversion curl wget ca-certificates gnupg gnupg2 lsb-release unzip -# install dockerize -ENV DOCKERIZE_VERSION v0.6.1 -RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ - && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ - && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz +COPY --from=bbb-docker-base-java /usr/local/bin/dockerize /usr/local/bin/dockerize # install freeswitch diff --git a/mod/html5/Dockerfile b/mod/html5/Dockerfile index bb9474d..c5d1add 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.3-alpine +FROM node:14.19.1-alpine RUN addgroup -g 2000 meteor && \ adduser -D -u 2001 -G meteor meteor && \ diff --git a/mod/html5/bbb-html5.yml b/mod/html5/bbb-html5.yml index 93a5b71..fb0e554 100644 --- a/mod/html5/bbb-html5.yml +++ b/mod/html5/bbb-html5.yml @@ -1,5 +1,6 @@ public: app: + bbbServerVersion: v2.5.0-beta.2-docker listenOnlyMode: {{ .Env.LISTEN_ONLY_MODE }} skipCheck: {{ .Env.DISABLE_ECHO_TEST }} clientTitle: {{ .Env.CLIENT_TITLE }} diff --git a/mod/html5/entrypoint.sh b/mod/html5/entrypoint.sh index 6dac08a..ce10bdb 100755 --- a/mod/html5/entrypoint.sh +++ b/mod/html5/entrypoint.sh @@ -11,7 +11,7 @@ export BIND_IP=0.0.0.0 export LANG=en_US.UTF-8 export INSTANCE_MAX=1 export ENVIRONMENT_TYPE=production -export NODE_VERSION=node-v14.18.3-linux-x64 +export NODE_VERSION=node-v14.19.1-linux-x64 export BBB_HTML5_LOCAL_SETTINGS=/app/bbb-html5.yml if [ "$DEV_MODE" == true ]; then diff --git a/mod/nginx/bbb-playback b/mod/nginx/bbb-playback index 074a128..4031c8e 160000 --- a/mod/nginx/bbb-playback +++ b/mod/nginx/bbb-playback @@ -1 +1 @@ -Subproject commit 074a1289087a2da1744621a8374b17acea262903 +Subproject commit 4031c8e5ff80c05cc6dec9b977c9df4a2cc51b35 diff --git a/mod/webrtc-sfu/Dockerfile b/mod/webrtc-sfu/Dockerfile index da222c0..e8d3263 100644 --- a/mod/webrtc-sfu/Dockerfile +++ b/mod/webrtc-sfu/Dockerfile @@ -23,7 +23,7 @@ RUN cd /app \ # ============================= -FROM node:14.18.3-bullseye-slim +FROM node:14.19.1-bullseye-slim RUN useradd --uid 2004 --user-group webrtc-sfu ENV NODE_ENV production diff --git a/mod/webrtc-sfu/bbb-webrtc-sfu b/mod/webrtc-sfu/bbb-webrtc-sfu index a342bfd..317495d 160000 --- a/mod/webrtc-sfu/bbb-webrtc-sfu +++ b/mod/webrtc-sfu/bbb-webrtc-sfu @@ -1 +1 @@ -Subproject commit a342bfd08d0caf66611addb292da53164a4f7fa4 +Subproject commit 317495d8fac75cfff911ff7d0c044678d19b4cee diff --git a/scripts/generate-compose b/scripts/generate-compose index f63cb96..abdefdd 100755 --- a/scripts/generate-compose +++ b/scripts/generate-compose @@ -48,6 +48,7 @@ docker run \ -e TAG_LEARNING_DASHBOARD=${TAG_LEARNING_DASHBOARD} \ -e TAG_RECORDINGS=${TAG_RECORDINGS} \ -e DEV_MODE=${DEV_MODE:-false} \ + -e EXTERNAL_IPv6=${EXTERNAL_IPv6:-} \ -e ENABLE_RECORDING=${ENABLE_RECORDING:-false} \ -e REMOVE_OLD_RECORDING=${REMOVE_OLD_RECORDING:-false} \ -e RECORDING_MAX_AGE_DAYS=${RECORDING_MAX_AGE_DAYS:-14} \ diff --git a/scripts/upgrade b/scripts/upgrade index be7451a..d815bd0 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,7 +33,7 @@ else docker build -t bbb-docker-base-java mod/base-java # rebuild everything which got modified - docker-compose build --pull + docker-compose build COMMIT_HASH=$(git rev-parse --short HEAD) BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD) diff --git a/tags.env b/tags.env index f789cff..502017d 100644 --- a/tags.env +++ b/tags.env @@ -7,16 +7,16 @@ BBB_BUILD_TAG=v2022-03-30 # https://github.com/bigbluebutton/bigbluebutton -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_COMMON_MESSAGE=v2.5.0-beta.2 +TAG_APPS_AKKA=v2.5.0-beta.2 +TAG_FSESL_AKKA=v2.5.0-beta.2 +TAG_BBB_WEB=v2.5.0-beta.2 +TAG_HTML5=v2.5.0-beta.2 +TAG_RECORDINGS=v2.5.0-beta.2 -TAG_LEARNING_DASHBOARD=v2.5.0-beta.1 -TAG_FS_CONFIG=v2.5.0-beta.1 +TAG_LEARNING_DASHBOARD=v2.5.0-beta.2 +TAG_FS_CONFIG=v2.5.0-beta.2 -IMAGE_NODE=node:14.18.3-bullseye-slim +IMAGE_NODE=node:14.19.1-bullseye-slim # TODO: variable still unused \ No newline at end of file