Merge pull request #291 from bigbluebutton/v2.7.1

BigBlueButton 2.7
2025-01-11 16:28:18 +01:00 · 2023-09-13 00:03:26 +02:00 · 2023-09-13 00:03:26 +02:00 · 58bbbed7cf
commit 58bbbed7cf
parent 4cff64c1a0 b82f6fbd70
22 changed files with 96 additions and 58 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,7 @@
 # Changelog

 ## Unreleased
+- BigBlueButton v2.7 @alangecker

 ## Release v2.6.0-2 (2023-04-04)
 - hotfix for broken freeswitch container due to enabled compresion with max file count == 1 [#260](https://github.com/bigbluebutton/docker/issues/260)
--- a/README.md
+++ b/README.md
@ -1,9 +1,9 @@
 <img width="1012" alt="bbb-docker-banner" src="https://user-images.githubusercontent.com/1273169/141153216-0386cd4e-0aaf-473a-8f42-a048e52ed0d7.png">


-# 📦 BigBlueButton 2.6 Docker
+# 📦 BigBlueButton 2.7 Docker

-Version: 2.6.0 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues)
+Version: 2.7.0 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues)

 ## Features
 - Easy installation
--- a/docker-compose.tmpl.yml
+++ b/docker-compose.tmpl.yml
@ -169,7 +169,7 @@ services:

  etherpad:
    build: mod/etherpad
-    image: alangecker/bbb-docker-etherpad:1.8.18-3
+    image: alangecker/bbb-docker-etherpad:1.9.1
    restart: unless-stopped
    depends_on:
      - redis
@ -193,7 +193,7 @@ services:
        ipv4_address: 10.7.7.18

  redis:
-    image: redis:7.0-alpine
+    image: redis:7.2-alpine
    restart: unless-stopped
    healthcheck:
      test: ["CMD", "redis-cli", "ping"]
@ -239,11 +239,14 @@ services:
    depends_on:
      - redis
      - freeswitch
+      - kurento
    environment:
      CLIENT_HOST: 10.7.7.1
      REDIS_HOST: 10.7.7.5
      FREESWITCH_IP: 10.7.7.1
      FREESWITCH_SIP_IP: ${EXTERNAL_IPv4}
+      MCS_HOST: 0.0.0.0
+      MCS_ADDRESS: 127.0.0.1
      ESL_IP: 10.7.7.1
      ESL_PASSWORD: ${FSESL_PASSWORD:-ClueCon}
      # TODO: add mediasoup IPv6
@ -316,7 +319,7 @@ services:

  periodic:
    build: mod/periodic
-    image: alangecker/bbb-docker-periodic:v2.5.0-rc.1
+    image: alangecker/bbb-docker-periodic:v2.7.0
    restart: unless-stopped
    depends_on:
      - mongodb
@ -435,7 +438,7 @@ services:
 {{ if isTrue .Env.ENABLE_GREENLIGHT }}
  # greenlight
  greenlight:
-    image: bigbluebutton/greenlight:{{ .Env.TAG_GREENLIGHT }}-alpine
+    image: bigbluebutton/greenlight:{{ .Env.TAG_GREENLIGHT }}
    restart: unless-stopped
    env_file: .env
    depends_on:
@ -452,6 +455,7 @@ services:
      {{end}}
      BIGBLUEBUTTON_SECRET: ${SHARED_SECRET}
      SECRET_KEY_BASE: ${RAILS_SECRET}
+      RELATIVE_URL_ROOT: /
    volumes:
       - ./greenlight-data:/usr/src/app/storage
    networks:
--- a/mod/apps-akka/Dockerfile
+++ b/mod/apps-akka/Dockerfile
@ -1,5 +1,5 @@
 ARG BBB_BUILD_TAG
-FROM gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:$BBB_BUILD_TAG AS builder
+FROM bigbluebutton/bbb-build:$BBB_BUILD_TAG AS builder

 ARG TAG_COMMON_MESSAGE

--- a/mod/base-java/Dockerfile
+++ b/mod/base-java/Dockerfile
@ -1,4 +1,4 @@
-FROM openjdk:11-jre-slim-bullseye
+FROM eclipse-temurin:17-jre-jammy

 RUN apt-get update && apt-get install -y \
        wget unzip gosu locales \
--- a/mod/bbb-pads/Dockerfile
+++ b/mod/bbb-pads/Dockerfile
@ -1,4 +1,4 @@
-FROM node:16-bullseye-slim AS builder
+FROM node:18-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:16-bullseye-slim
+FROM node:18-bullseye-slim

 RUN apt update && apt install -y jq moreutils \
    && useradd --uid 2003 --create-home --user-group bbb-pads
--- a/mod/bbb-pads/bbb-pads
+++ b/mod/bbb-pads/bbb-pads
@ -1 +1 @@
-Subproject commit 570921cff678e4e627a37e781c2a33a50be521f2
+Subproject commit 8909b728c0d427226b05523915f8f1e03e58eb13
--- a/mod/bbb-web/Dockerfile
+++ b/mod/bbb-web/Dockerfile
@ -1,5 +1,5 @@
 ARG BBB_BUILD_TAG
-FROM gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:$BBB_BUILD_TAG AS builder
+FROM bigbluebutton/bbb-build:$BBB_BUILD_TAG AS builder

 ARG TAG_COMMON_MESSAGE

--- a/mod/etherpad/Dockerfile
+++ b/mod/etherpad/Dockerfile
@ -1,20 +1,19 @@
-FROM etherpad/etherpad:1.8.18
+FROM etherpad/etherpad:1.9.1

 USER root

-RUN apt-get update \
-    && apt-get install -y git curl
+RUN apk add git curl

 USER etherpad

-RUN npm install  \
+RUN npm install \
    ep_cursortrace@3.1.16 \
    git+https://github.com/mconf/ep_pad_ttl.git#360136cd38493dd698435631f2373cbb7089082d \
-    git+https://github.com/mconf/ep_redis_publisher.git#a30a48e4bc1e501b5b102884b9a0b26c30798484 \
+    git+https://github.com/mconf/ep_redis_publisher.git#2b6e47c1c59362916a0b2961a29b259f2977b694 \
    ep_disable_chat@0.0.8 \
    ep_auth_session@1.1.1 \
 # remove npm lockfile, because somehow it prevents etherpad from detecting the manual added plugin ep_bigbluebutton_patches
-    && rm package-lock.json
+    && rm package-lock.json package.json

 # add skin from git submodule
 COPY --chown=etherpad:0 ./bbb-etherpad-skin /opt/etherpad-lite/src/static/skins/bigbluebutton
--- a/mod/etherpad/entrypoint.sh
+++ b/mod/etherpad/entrypoint.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 echo $ETHERPAD_API_KEY > /tmp/apikey
 export NODE_ENV=production

--- a/mod/etherpad/etherpad-export.sh
+++ b/mod/etherpad/etherpad-export.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 src="$8"
 dest="$(echo $8 | sed -E -e 's/html|odt/'$7'/')"
 convertTo="$7"
--- a/mod/etherpad/settings.json
+++ b/mod/etherpad/settings.json
@ -89,7 +89,7 @@
 *
 *    "defaultPadText" : "${DEFAULT_PAD_TEXT}Line 1\nLine 2"
 */
-{
+ {
  /*
   * Name your instance!
   */
@ -198,8 +198,7 @@

  "dbType": "redis",
  "dbSettings": {
-    "host": "redis",
-    "port": 6379
+    "url": "redis://redis:6379"
  },

  /*
@ -220,9 +219,10 @@
  */

  /*
-   * The default text of a pad
-   */
-  "defaultPadText" : "",
+  * The default text of a pad: A zero-width-space is used to work around an issue with Etherpad 1.9.1 where empty pads are not being created.
+  * See: https://github.com/ether/etherpad-lite/issues/5787
+  */
+   "defaultPadText" : "\u200b",

  /*
   * Default Pad behavior.
@ -539,7 +539,7 @@
    "windowMs": 90000,

    // maximum number of requests per IP to allow during the rate limit window
-    "max": 10
+    "max": 16
  },

  /*
@ -597,7 +597,40 @@
  "loglevel": "INFO",

  /* Override any strings found in locale directories */
-  "customLocaleStrings": {},
+  "customLocaleStrings": {
+    "de": {
+      "pad.importExport.import_export": "Export",
+      "pad.toolbar.import_export.title": "Export zu verschiedenen Dateiformaten"
+    },
+    "en-gb": {
+      "pad.importExport.import_export": "Export",
+      "pad.toolbar.import_export.title": "Export to different file formats"
+    },
+    "en": {
+      "pad.importExport.import_export": "Export",
+      "pad.toolbar.import_export.title": "Export to different file formats"
+    },
+    "es": {
+      "pad.importExport.import_export": "Exportar",
+      "pad.toolbar.import_export.title": "Exportar a diferentes formatos de archivos"
+    },
+    "fr": {
+      "pad.importExport.import_export": "Exporter",
+      "pad.toolbar.import_export.title": "Exporter vers un format de fichier différent"
+    },
+    "it": {
+      "pad.importExport.import_export": "Esportazione",
+      "pad.toolbar.import_export.title": "Esporta a diversi formati di file"
+    },
+    "pt-br": {
+      "pad.importExport.import_export": "Exportar",
+      "pad.toolbar.import_export.title": "Exportar para diferentes formatos de arquivo"
+    },
+    "pt": {
+      "pad.importExport.import_export": "Exportar",
+      "pad.toolbar.import_export.title": "Exportar para diferentes formatos de ficheiro"
+    }
+  },

  /* Disable Admin UI tests */
  "enableAdminUITests": false
--- a/mod/freeswitch/Dockerfile
+++ b/mod/freeswitch/Dockerfile
@ -1,5 +1,5 @@
 ARG BBB_BUILD_TAG
-FROM gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:$BBB_BUILD_TAG AS builder
+FROM bigbluebutton/bbb-build:$BBB_BUILD_TAG AS builder

 ARG TAG_FREESWITCH
 RUN mkdir -p /build/freeswitch && \
--- a/mod/freeswitch/conf/autoload_configs/modules.conf.xml
+++ b/mod/freeswitch/conf/autoload_configs/modules.conf.xml
@ -13,6 +13,7 @@
    <load module="mod_commands"/>
    <load module="mod_conference"/>
    <load module="mod_dptools"/>
+    <load module="mod_audio_fork"/>

    <!-- Dialplan Interfaces -->
    <load module="mod_dialplan_xml"/>
--- a/mod/fsesl-akka/Dockerfile
+++ b/mod/fsesl-akka/Dockerfile
@ -1,5 +1,5 @@
 ARG BBB_BUILD_TAG
-FROM gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:$BBB_BUILD_TAG AS builder
+FROM bigbluebutton/bbb-build:$BBB_BUILD_TAG AS builder

 ARG TAG_COMMON_MESSAGE

--- a/mod/html5/Dockerfile
+++ b/mod/html5/Dockerfile
@ -1,5 +1,5 @@
 ARG BBB_BUILD_TAG
-FROM gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:$BBB_BUILD_TAG AS builder
+FROM bigbluebutton/bbb-build:$BBB_BUILD_TAG AS builder

 # RUN groupadd -g 2000 meteor && useradd -m -u 2001 -g meteor meteor
 # USER meteor
@ -24,7 +24,7 @@ RUN sed -i "s/VERSION/$TAG_HTML5/" /app/bundle/programs/web.browser/head.html \

 # ------------------------------

-FROM node:14-bullseye-slim
+FROM node:14.21-bullseye-slim

 RUN apt-get update && apt-get install -y gosu

--- a/mod/nginx/Dockerfile
+++ b/mod/nginx/Dockerfile
@ -1,5 +1,5 @@
 ARG BBB_BUILD_TAG
-FROM gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:$BBB_BUILD_TAG AS builder
+FROM bigbluebutton/bbb-build:$BBB_BUILD_TAG AS builder

 # --------------------

@ -8,11 +8,11 @@ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_LEARNI
 RUN cd /bbb-learning-dashboard && npm ci && npm run build

 COPY ./bbb-playback /bbb-playback
-RUN cd /bbb-playback && npm ci && npm run build
+RUN cd /bbb-playback && npm install && npm run-script build

 # --------------------

-FROM nginx:1.23-alpine
+FROM nginx:1.25-alpine

 COPY --from=builder /bbb-learning-dashboard/build /www/learning-analytics-dashboard/
 COPY --from=builder /bbb-playback/build /www/playback/presentation/2.3
--- a/mod/nginx/bbb-playback
+++ b/mod/nginx/bbb-playback
@ -1 +1 @@
-Subproject commit 2fd02ed28f9b4f423783b1ba5f43135b9548b5e1
+Subproject commit 134315bc6fa9a263b72be3b33dc64e5124363947
--- a/mod/webhooks/Dockerfile
+++ b/mod/webhooks/Dockerfile
@ -1,4 +1,4 @@
-FROM node:16-bullseye-slim AS builder
+FROM node:18-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:16-bullseye-slim
+FROM node:18-bullseye-slim
 RUN useradd --uid 2004 --user-group bbb-webhooks

 COPY --from=builder /usr/bin/yq /usr/bin/yq
--- a/mod/webrtc-sfu/Dockerfile
+++ b/mod/webrtc-sfu/Dockerfile
@ -1,5 +1,5 @@
 ARG BBB_BUILD_TAG
-FROM gitlab.senfcall.de:5050/senfcall-public/docker-bbb-build:$BBB_BUILD_TAG AS builder
+FROM bigbluebutton/bbb-build:$BBB_BUILD_TAG AS builder


 RUN useradd --uid 2004 --user-group webrtc-sfu 
@ -23,7 +23,7 @@ RUN cd /app \


 # =============================
-FROM node:16-bullseye-slim
+FROM node:18-bullseye-slim
 RUN useradd --uid 2004 --user-group webrtc-sfu 
 ENV NODE_ENV production

--- a/mod/webrtc-sfu/bbb-webrtc-sfu
+++ b/mod/webrtc-sfu/bbb-webrtc-sfu
@ -1 +1 @@
-Subproject commit f74deebf2fa9ef1fa96b650b9b25c5f32d1b24b5
+Subproject commit 47ad89c6c6d11bccb3172d3341f5b36386d272f5
--- a/tags.env
+++ b/tags.env
@ -3,29 +3,29 @@
 # - docker compose build


-# https://gitlab.senfcall.de/senfcall-public/docker-bbb-build
-BBB_BUILD_TAG=v2022-12-29-grails-524
+# https://hub.docker.com/r/bigbluebutton/bbb-build
+BBB_BUILD_TAG=bbb27-2023-06-13-java17

 # https://github.com/bigbluebutton/bigbluebutton
-TAG_COMMON_MESSAGE=v2.6.0
-TAG_APPS_AKKA=v2.6.0
-TAG_FSESL_AKKA=v2.6.0
-TAG_BBB_WEB=v2.6.0
-TAG_HTML5=v2.6.0
-TAG_RECORDINGS=v2.6.0
+TAG_COMMON_MESSAGE=v2.7.0
+TAG_APPS_AKKA=v2.7.0
+TAG_FSESL_AKKA=v2.7.0
+TAG_BBB_WEB=v2.7.0
+TAG_HTML5=v2.7.0
+TAG_RECORDINGS=v2.7.0

-TAG_LEARNING_DASHBOARD=v2.6.0
-TAG_FS_CONFIG=v2.6.0
-TAG_FS_BUILD_FILES=v2.6.0
+TAG_LEARNING_DASHBOARD=v2.7.0
+TAG_BBB_PRESENTATION_VIDEO=4.0.3
+TAG_FS_CONFIG=v2.7.0
+TAG_FS_BUILD_FILES=v2.7.0

-TAG_FREESWITCH=v1.10.9
-TAG_GREENLIGHT=v3.0.2
+TAG_FREESWITCH=v1.10.10
+TAG_GREENLIGHT=v3.0.6.1

 # individual git submodules
 # use `./scripts/checkout-submodules` to ensure, that the submodules
 # match the provided tags here
-TAG_WEBRTC_SFU=v2.9.8
+TAG_WEBRTC_SFU=v2.11.0
 TAG_WEBHOOKS=v2.6.0
-TAG_PLAYBACK=v5.0.0-rc.2
-TAG_PADS=v1.4.1
-TAG_BBB_PRESENTATION_VIDEO=4.0.0-rc.2
+TAG_PLAYBACK=v5.0.0
+TAG_PADS=v1.5.1