update libopusenc

In the current template, SHARED_SECRET is not handed to the recordings container. In turn, the recording_ready callback to greenlight does not work, preventing recordings from being displayed correctly.

This patch addresses issue #268.

CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
 ## Unreleased
+- BigBlueButton 2.7.3 @alangecker
+
+
+## Release v2.7.0 (2023-09)
+- BigBlueButton 2.7.0 @alangecker [#291](https://github.com/bigbluebutton/docker/pull/291)
+- Update to ComposeV2 @leonidas-o [#271](https://github.com/bigbluebutton/docker/pull/271)
+- recordings: fix for missing `SHARED_SECRET` @ichdasich [#274](https://github.com/bigbluebutton/docker/issues/274) [#268](https://github.com/bigbluebutton/docker/issues/268)
+- Add RESOLVER_ADDRESS to env for docker-nginx-auto-ssl @pkolmann [#277](https://github.com/bigbluebutton/docker/pull/277)
+- Fix learning-dashboard @yanus [#262](https://github.com/bigbluebutton/docker/pull/262)
 
 ## 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)

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.3 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues)
 
 ## Features
 - Easy installation
@@ -13,19 +13,25 @@ Version: 2.6.0 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigblue
 - Full IPv6 support
 - Runs on any major linux distributon (Debian, Ubuntu, CentOS,...)
 
+## Requirements
+- 4GB of RAM
+- Linux (it will not work under WSL)
+- Root access (bbb-docker uses host networking, so it won't work with Kubernetes, any "CaaS"-Service, etc.)
+- Public IPv4 (expect issues with a firewall / NAT)
+
 ## What is not implemented yet
 - bbb-lti
 
 ## Install
-1. Install docker-ce & docker-compose
+1. Install docker-ce & docker-compose-plugin
     1. follow instructions
         * Debian: https://docs.docker.com/engine/install/debian/
         * CentOS: https://docs.docker.com/engine/install/centos/
         * Fedora: https://docs.docker.com/engine/install/fedora/
         * Ubuntu: https://docs.docker.com/engine/install/ubuntu/
     2. Ensure docker works with `$ docker run hello-world`
-    3. Install docker-compose: https://docs.docker.com/compose/install/
-    4. Ensure docker-compose works and that you use a version ≥ 1.28 : `$ docker-compose --version`
+    3. Install docker compose V2: https://docs.docker.com/compose/install/
+    4. Ensure docker compose works and that you use a version ≥ 1.28 : `$ docker compose --version`
 2. Clone this repository
    ```sh
    $ git clone --recurse-submodules https://github.com/bigbluebutton/docker.git bbb-docker
@@ -46,11 +52,11 @@ Version: 2.6.0 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigblue
    ```
 5. Start containers:
     ```bash
-    $ docker-compose up -d
+    $ docker compose up -d
     ```
 6. If you use greenlight, you can create an admin account with:
     ```bash
-    $ docker-compose exec greenlight bundle exec rake admin:create
+    $ docker compose exec greenlight bundle exec rake admin:create
     ```
 
 ## Further How-To's

docker-compose.tmpl.yml

@@ -135,7 +135,7 @@ services:
       - vol-freeswitch:/var/freeswitch/meetings
     network_mode: host
     logging:
-      # reduce logs to a minimum, so `docker-compose logs -f` still works
+      # reduce logs to a minimum, so `docker compose logs -f` still works
       driver: "local"
       options:
         max-size: "10k"
@@ -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
@@ -350,6 +353,7 @@ services:
       - bbb-pads
     environment:
       DOMAIN: ${DOMAIN}
+      SHARED_SECRET: ${SHARED_SECRET}
     volumes:
       - bigbluebutton:/var/bigbluebutton
       - vol-freeswitch:/var/freeswitch/meetings
@@ -401,6 +405,9 @@ services:
       {{else}}
       ALLOWED_DOMAINS: ${DOMAIN}
       {{end}}
+      {{ if .Env.RESOLVER_ADDRESS }}
+      RESOLVER_ADDRESS: ${RESOLVER_ADDRESS}
+      {{end}}
     network_mode: host
 {{end}}
 
@@ -432,7 +439,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:
@@ -449,6 +456,7 @@ services:
       {{end}}
       BIGBLUEBUTTON_SECRET: ${SHARED_SECRET}
       SECRET_KEY_BASE: ${RAILS_SECRET}
+      RELATIVE_URL_ROOT: /
     volumes:
        - ./greenlight-data:/usr/src/app/storage
     networks:

docs/development.md

@@ -42,11 +42,11 @@ RAILS_SECRET=SuperRailsSecret_SuperRailsSecret
 - regenerate `docker-compose.yml` \
   `$ ./scripts/generate-compose`
 - build the images \
-  `$ docker-compose build`
+  `$ docker compose build`
 - you can than start it with \
-  `$ docker-compose up -d`
+  `$ docker compose up -d`
 - view the logs with \
-  `$ docker-compose logs -f`
+  `$ docker compose logs -f`
 - and access the API via \
   https://mconf.github.io/api-mate/#server=https://10.7.7.1/bigbluebutton/api&sharedSecret=SuperSecret
     * At some point your browser will warn you about an invalid certificate, but you can press _"Accept the Risk and Continue" / "Proceed to 10.7.7.1 (unsafe)"_
@@ -60,9 +60,9 @@ RAILS_SECRET=SuperRailsSecret_SuperRailsSecret
   - recreate `docker-compose.yml` \
     `$ ./scripts/generate-compose`
   * rebuild the image(s): \
-    `$ docker-compose build [containername]`
+    `$ docker compose build [containername]`
   * restart changes image(s): \
-    `$ docker-compose up -d`
+    `$ docker compose up -d`
 
 
 ## How to do create a new update for a newer BBB release?

docs/upgrading.md

@@ -1,7 +1,7 @@
 # How To Upgrade bbb-docker
 
 
-### Upgrading `v2.5.x` -> `v2.6.x`
+### Upgrading from `v2.5.x`
 
 - *Breaking change:* Greenlight got fully rewritten
     * it is starting as a fresh installation. you can migrate your data with `./scripts/greenlight-migrate-v2-v3`
@@ -10,7 +10,7 @@
 
 apart from that follow the guide below.
 
-### within `v2.6.x`
+### from `v2.6.x` or within `v2.7.x`
 #### Backup
 if you use greenlight, create a database backup first
 ```bash
@@ -23,5 +23,5 @@ docker exec -t docker_postgres_1 pg_dumpall -c -U postgres > /root/greenlight_`d
 ./scripts/upgrade
 
 # restart updated services
-docker-compose up -d
+docker compose up -d
 ```

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
 

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 \

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

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
 

mod/etherpad/Dockerfile

@@ -1,20 +1,19 @@
-FROM etherpad/etherpad:1.8.18
+FROM etherpad/etherpad:1.9.4
 
 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

mod/etherpad/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 echo $ETHERPAD_API_KEY > /tmp/apikey
 export NODE_ENV=production
 

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"

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

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 && \
@@ -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

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"/>

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
 

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
 
@@ -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"]

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 }}

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 \

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

mod/recordings/bbb-web.properties

@@ -1 +1,2 @@
+bigbluebutton.web.serverURL=https://{{ .Env.DOMAIN }}
 securitySalt={{ .Env.SHARED_SECRET }}

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

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
 

sample.env

@@ -6,6 +6,8 @@
 # HTTPS Proxy
 # fully automated Lets Encrypt certificates
 ENABLE_HTTPS_PROXY=true
+# If your network doesn't allow access to DNS at 8.8.8.8 specify your own resolvers
+#RESOLVER_ADDRESS=x.x.x.x
 
 # coturn (a TURN Server)
 # requires either the abhove HTTPS Proxy to be enabled

scripts/bbb-record

@@ -16,5 +16,5 @@ if [ ! "$ENABLE_RECORDING" == true ]; then
   exit 1
 fi
 
-docker-compose exec recordings bbb-record $@
-docker-compose logs --tail=15 recordings
+docker compose exec recordings bbb-record $@
+docker compose logs --tail=15 recordings

scripts/fs_cli

@@ -9,4 +9,4 @@ then
   export $(cat .env | sed 's/#.*//g' | grep "FSESL_PASSWORD" | xargs)
 fi
 
-docker-compose exec freeswitch /opt/freeswitch/bin/fs_cli -H 10.7.7.1 -p "$FSESL_PASSWORD"
+docker compose exec freeswitch /opt/freeswitch/bin/fs_cli -H 10.7.7.1 -p "$FSESL_PASSWORD"

scripts/generate-compose

@@ -61,6 +61,7 @@ docker run  \
     -e REMOVE_OLD_RECORDING=${REMOVE_OLD_RECORDING:-false} \
     -e RECORDING_MAX_AGE_DAYS=${RECORDING_MAX_AGE_DAYS:-14} \
     -e ENABLE_HTTPS_PROXY=${ENABLE_HTTPS_PROXY:-false} \
+    -e RESOLVER_ADDRESS=${RESOLVER_ADDRESS} \
     -e ENABLE_WEBHOOKS=${ENABLE_WEBHOOKS:-false} \
     -e ENABLE_COTURN=${ENABLE_COTURN:-false} \
     -e ENABLE_GREENLIGHT=${ENABLE_GREENLIGHT:-false} \

scripts/greenlight-migrate-v2-v3

@@ -8,7 +8,7 @@ then
   export $(cat .env | sed 's/#.*//g' | grep -E "RAILS_SECRET|POSTGRESQL_SECRET" | xargs)
 fi
 
-COMPOSE_PREFIX=$(docker-compose ps | grep postgres | awk '{print $1}' | sed 's/-postgres-1//')
+COMPOSE_PREFIX=$(docker compose ps | grep postgres | awk '{print $1}' | sed 's/-postgres-1//')
 
 docker kill -s SIGKILL greenlight-v2-tmp 2>/dev/null
 sleep 1

scripts/publish

@@ -31,11 +31,11 @@ fi
 docker build -t alangecker/bbb-docker-base-java:latest mod/base-java
 
 # buld and push other images
-docker-compose build
+docker compose build
 
 # push images
 docker push alangecker/bbb-docker-base-java:latest
-docker-compose push \
+docker compose push \
     html5-backend-1 \
     bbb-web \
     freeswitch \

scripts/setup

@@ -208,4 +208,4 @@ echo "make sure to recreate the docker-compose.yml after each change"
 echo "  $ ./scripts/generate-compose"
 echo ""
 echo "to start bigbluebutton run"
-echo "  $ docker-compose up -d"
+echo "  $ docker compose up -d"

scripts/upgrade

@@ -21,7 +21,7 @@ else
 
     echo ""
     echo "# pull newest images"
-    docker-compose pull --ignore-pull-failures
+    docker compose pull --ignore-pull-failures
     
 
     COMMIT_HASH=$(git rev-parse --short HEAD)
@@ -33,6 +33,6 @@ else
     echo "we are on $COMMIT_HASH ($BRANCH_NAME)"
     echo ""
     echo "use following command for restarting bbb:"
-    echo "    $ docker-compose up -d --no-build"
+    echo "    $ docker compose up -d --no-build"
     echo "-------------------------------------"
 fi

scripts/upgrade-and-build

@@ -25,14 +25,14 @@ else
 
     echo ""
     echo "# pull newest images"
-    docker-compose pull --ignore-pull-failures
+    docker compose pull --ignore-pull-failures
 
     echo ""
     echo "# rebuild images"
     docker build -t alangecker/bbb-docker-base-java:latest mod/base-java
 
     # rebuild everything which got modified
-    docker-compose build
+    docker compose build
 
     COMMIT_HASH=$(git rev-parse --short HEAD)
     BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
@@ -43,6 +43,6 @@ else
     echo "we are on $COMMIT_HASH ($BRANCH_NAME)"
     echo ""
     echo "use following command for restarting bbb:"
-    echo "    $ docker-compose up -d"
+    echo "    $ docker compose up -d"
     echo "-------------------------------------"
 fi

tags.env

@@ -1,31 +1,31 @@
 # after changing a tag always run following commands to apply
 # - ./scripts/generate-compose
-# - docker-compose build
+# - 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.1
-TAG_FSESL_AKKA=v2.6.0
-TAG_BBB_WEB=v2.6.1
-TAG_HTML5=v2.6.1
-TAG_RECORDINGS=v2.6.1
+TAG_COMMON_MESSAGE=v2.7.0
+TAG_APPS_AKKA=v2.7.3
+TAG_FSESL_AKKA=v2.7.0
+TAG_BBB_WEB=v2.7.3
+TAG_HTML5=v2.7.3
+TAG_RECORDINGS=v2.7.0
 
-TAG_LEARNING_DASHBOARD=v2.6.0
-TAG_BBB_PRESENTATION_VIDEO=4.0.1
-TAG_FS_CONFIG=v2.6.0
-TAG_FS_BUILD_FILES=v2.6.0
+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.9
-TAG_GREENLIGHT=v3.0.2
+TAG_FREESWITCH=v1.10.10
+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.9.8
-TAG_WEBHOOKS=v2.6.0
-TAG_PLAYBACK=v5.0.0
-TAG_PADS=v1.4.1
+TAG_WEBRTC_SFU=v2.12.0
+TAG_WEBHOOKS=v2.6.1
+TAG_PLAYBACK=v5.0.2
+TAG_PADS=v1.5.2