Release v3.0.19

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
 ## Unreleased
+- update to 3.0.19 @alangecker [#377](https://github.com/bigbluebutton/docker/pull/377)
+- Add restart policy to HAProxy container @timoschwarzer [#373](https://github.com/bigbluebutton/docker/pull/373)
+- Add enable switches for Collabora and Coturn + make Collabora URL configurable @kevinveenbirkenbach [#372](https://github.com/bigbluebutton/docker/pull/372)
+- Add missing volume mounts for coturn and redis
+ @matthijskooijman [#370](https://github.com/bigbluebutton/docker/pull/370)
+- Stop using network_mode: host for nginx and haproxy @ matthijskooijman
+ [#369](https://github.com/bigbluebutton/docker/pull/369)
 
 ## Release v3.0.4 (2025-03-27)
 - update to 3.0.4 @tibroc [#347](https://github.com/bigbluebutton/docker/pull/347

README.md

@@ -3,7 +3,7 @@
 
 # 📦 BigBlueButton 3.0 Docker
 
-Version: 3.0.4 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues) | [Upgrading](docs/upgrading.md) | [Development](docs/development.md)
+Version: 3.0.19 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues) | [Upgrading](docs/upgrading.md) | [Development](docs/development.md)
 
 ## Features
 - Easy installation

docker-compose.tmpl.yml

@@ -35,7 +35,9 @@ services:
         - redis
         - etherpad
         - bbb-pads
+        {{ if isTrue .Env.ENABLE_COLLABORA }}
         - collabora
+        {{ end }}
     healthcheck:
       test: wget --no-proxy --no-verbose --tries=1 --spider http://10.7.7.2:8090/bigbluebutton/api || exit 1
       start_period: 2m
@@ -52,6 +54,7 @@ services:
       TURN_EXT_SERVER: ${TURN_EXT_SERVER:-}
       TURN_EXT_SECRET: ${TURN_EXT_SECRET:-}
       ENABLE_LEARNING_DASHBOARD: ${ENABLE_LEARNING_DASHBOARD:-true}
+      COLLABORA_URL: ${COLLABORA_URL:-https://collabora:9980/cool}
     volumes:
       - ./data/bigbluebutton:/var/bigbluebutton
       - ./data/freeswitch-meetings:/var/freeswitch/meetings
@@ -116,7 +119,7 @@ services:
       args:
         BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }}
         TAG_BBB: {{ .Env.TAG_BBB }}
-    image: alangecker/bbb-docker-nginx:{{ .Env.TAG_BBB }}-{{ .Env.TAG_PLAYBACK }}-1.25
+    image: alangecker/bbb-docker-nginx:{{ .Env.TAG_BBB }}-{{ .Env.TAG_PLAYBACK }}-1.29
     restart: unless-stopped
     volumes:
       - ./data/bigbluebutton:/var/bigbluebutton
@@ -126,9 +129,22 @@ services:
       # overwrite html5 config 
       - ./mod/nginx/bbb-html5.dev.nginx:/etc/nginx/bbb/bbb-html5.nginx:ro
       {{ end }}
+    ports:
+      # make sure nginx ports are also still available under the
+      # IPs 127.0.0.1 & 10.7.7.1 for backwards compatibility with exiting setup
+      # Warning: deprecated! this gets removed at some point
+      # Use 10.7.7.34 for new setups
+      - "127.0.0.1:48082:48082"
+      - "127.0.0.1:48081:48081"
+      - "127.0.0.1:48087:48087"
+      - "10.7.7.1:48082:48082"
+      - "10.7.7.1:48081:48081"
+      - "10.7.7.1:48087:48087"
+    networks:
+      bbb-net:
+        ipv4_address: 10.7.7.34
     tmpfs:
      - /tmp
-    network_mode: host
     extra_hosts:
       - "host.docker.internal:10.7.7.1"
       - "bbb-web:10.7.7.2"
@@ -145,14 +161,17 @@ services:
         - plugin=./repos/bbb-etherpad-plugin
         - skin=./repos/bbb-etherpad-skin
       args:
-        TAG_ETHERPAD: "2.2.7"
-    image: alangecker/bbb-docker-etherpad:2.2.7-s{{ .Env.COMMIT_ETHERPAD_SKIN }}-p{{ .Env.COMMIT_ETHERPAD_PLUGIN }}
+        TAG_ETHERPAD: "2.4.2"
+    image: alangecker/bbb-docker-etherpad:2.4.2-s{{ .Env.COMMIT_ETHERPAD_SKIN }}-p{{ .Env.COMMIT_ETHERPAD_PLUGIN }}
     restart: unless-stopped
     depends_on:
       - redis
+      {{ if isTrue .Env.ENABLE_COLLABORA }}
       - collabora
+      {{ end }}
     environment:
       ETHERPAD_API_KEY: ${ETHERPAD_API_KEY}
+      COLLABORA_URL:    ${COLLABORA_URL:-https://collabora:9980/cool}
     networks:
       bbb-net:
         ipv4_address: 10.7.7.4
@@ -197,7 +216,7 @@ services:
       - /tmp
 
   redis:
-    image: redis:7.2-alpine
+    image: redis:8.4-alpine
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
@@ -207,6 +226,8 @@ services:
     networks:
       bbb-net:
         ipv4_address: 10.7.7.5
+    volumes:
+      - ./data/redis:/data
 
   webrtc-sfu:
     build: 
@@ -290,7 +311,7 @@ services:
         - src=./repos/bigbluebutton/bbb-graphql-server
       args:
         BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }}
-        GRAPHQL_ENGINE_TAG: v2.45.0
+        GRAPHQL_ENGINE_TAG: v2.48.1
     image: alangecker/bbb-docker-graphql-server:{{ .Env.TAG_BBB }}
     depends_on:
       - postgres
@@ -353,8 +374,6 @@ services:
     networks:
       bbb-net:
         ipv4_address: 10.7.7.32
-    extra_hosts:
-      - "nginx:10.7.7.1"
 
     {{ if isTrue .Env.DEV_MODE }}
     user: ${BBB_DEV_UID}:${BBB_DEV_GID}
@@ -366,6 +385,7 @@ services:
       - ./.cache/go-build:/.cache/go-build:rw
     {{ end }}
 
+{{ if isTrue .Env.ENABLE_COLLABORA }}
   collabora:
     image: collabora/code:latest
     restart: unless-stopped
@@ -377,7 +397,7 @@ services:
     # disable logging (way to verbose)
     logging:
       driver: none
-
+{{ end }}
 
   periodic:
     build: mod/periodic
@@ -409,7 +429,7 @@ services:
         - bbb-conf=./repos/bigbluebutton/bigbluebutton-config
       args:
         BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }}
-        TAG_BBB_PRESENTATION_VIDEO: "5.0.0-beta.2"
+        TAG_BBB_PRESENTATION_VIDEO: "5.0.0"
     image: alangecker/bbb-docker-recordings:{{ .Env.TAG_BBB }}
     restart: unless-stopped
     depends_on:
@@ -470,7 +490,8 @@ services:
 
   haproxy:
     build: mod/haproxy
-    image: alangecker/bbb-haproxy:2.8.10
+    image: alangecker/bbb-haproxy:3.0.9
+    restart: unless-stopped
     volumes:
       - ./data/haproxy/letsencrypt:/etc/letsencrypt
       - ./mod/haproxy/haproxy.cfg:/etc/haproxy/haproxy.cfg
@@ -479,12 +500,18 @@ services:
       - IGNORE_TLS_CERT_ERRORS={{$ignore_tls_cert_errors}}
       - CERT1=${DOMAIN}
       - EMAIL=${LETSENCRYPT_EMAIL}
-    network_mode: host
+    ports:
+      - 80:80
+      - 443:443
+    networks:
+      bbb-net:
+        ipv4_address: 10.7.7.35
 {{end}}
 
+{{ if isTrue .Env.ENABLE_COTURN }}
   # coturn
   coturn:
-    image: coturn/coturn:4.6-alpine
+    image: coturn/coturn:4.8-alpine
     restart: unless-stopped
     command:
       - "--external-ip=${EXTERNAL_IPv4}/${EXTERNAL_IPv4}"
@@ -495,13 +522,14 @@ services:
       - "--relay-ip=${EXTERNAL_IPv6:-::1}"
     volumes:
       - ./mod/coturn/turnserver.conf:/etc/coturn/turnserver.conf
+      - ./data/coturn:/var/lib/coturn
     network_mode: host
-
+{{end}}
 
 {{ if isTrue .Env.ENABLE_GREENLIGHT }}
   # greenlight
   greenlight:
-    image: bigbluebutton/greenlight:v3.5.0
+    image: bigbluebutton/greenlight:v3.6.3
     restart: unless-stopped
     env_file: .env
     depends_on:
@@ -512,7 +540,7 @@ services:
       DATABASE_URL: postgres://postgres:${POSTGRESQL_SECRET:-password}@postgres:5432/greenlight
       REDIS_URL: redis://redis:6379
       {{ if $ignore_tls_cert_errors }}
-      BIGBLUEBUTTON_ENDPOINT: http://10.7.7.1:48083/bigbluebutton/api
+      BIGBLUEBUTTON_ENDPOINT: http://10.7.7.34:48083/bigbluebutton/api
       {{else}}
       BIGBLUEBUTTON_ENDPOINT: https://${DOMAIN}/bigbluebutton/api
       {{end}}
@@ -551,7 +579,7 @@ services:
     image: greenstatic/bigbluebutton-exporter:latest
     restart: unless-stopped
     environment:
-      API_BASE_URL: http://10.7.7.1:48087/bigbluebutton/api/
+      API_BASE_URL: http://10.7.7.34:48087/bigbluebutton/api/
       API_SECRET: ${SHARED_SECRET}
       RECORDINGS_METRICS_READ_FROM_DISK: "${ENABLE_PROMETHEUS_EXPORTER_OPTIMIZATION:-false}"
     networks:

docs/existing-web-server.md

@@ -8,7 +8,17 @@ You could dedicate a virtual host to BigBlueButton, allowing external access to
 
 ## Installation
 1. Install BigBlueButton Docker [as explained above](#install). While running the setup script, please choose `n` when you're asked the following question: `Should an automatic HTTPS Proxy be included? (y/n)`.
-2. Now all the required Docker containers should be running. BigBlueButton listens to port 48087. Create a virtual host by which BigBlueButton will be publicly accessible (in this case, let's assume the following server name for the virtual host: `bbb.example.com`). Enable SSL for the new _https_ virtual host. Make sure that the SSL certificate you will be using is signed by a CA (Certificate Authority). You could generate an SSL certificate for free using Let's Encrypt. It is suggested to add some directives to the _http_ virtual host `bbb.example.com` to redirect all requests to the _https_ one.
+2. Now all the required Docker containers should be running. BigBlueButton listens to port 48087 (among others, but 48087 is intended for external reverse proxies). By default, the port is only opened on the internal bbb-net network created by docker-compose, so either your reverse proxy should run within the same docker-compose file or otherwise have access to the network, or the port should be made available on the host system by adding something like:
+   ```
+   ports:
+    - "127.0.0.1:48087:48087
+    - "[::1]:48087:48087
+   ```
+   In the `nginx` container config in `docker-compose.yml`.
+
+   The rest of this document assumes you did the latter.
+
+3. Create a virtual host by which BigBlueButton will be publicly accessible (in this case, let's assume the following server name for the virtual host: `bbb.example.com`). Enable SSL for the new _https_ virtual host. Make sure that the SSL certificate you will be using is signed by a CA (Certificate Authority). You could generate an SSL certificate for free using Let's Encrypt. It is suggested to add some directives to the _http_ virtual host `bbb.example.com` to redirect all requests to the _https_ one.
 
 At this point, choose one of the following sections according to which Web server you're running ([Apache](#integration-with-apache)).
 

docs/network-config.md

@@ -1,30 +1,33 @@
 
 ## Network Configuration
 Services as configured.
-|Service | Network | IP address | Other Option |
+
+|Service | Network | IP address |
 --- | --- | --- | --- 
+| html5-dev | network_mode: host | |
 | bbb-web | bbb-net | 10.7.7.2 |
+| freeswitch| bbb-net | 10.7.7.10 |
+| nginx | bbb-net | 10.7.7.34 |
+| etherpad | bbb-net | 10.7.7.4 |
 | bbb-pads | bbb-net | 10.7.7.18 |
-| html5-backend-{{$i}} | bbb-net | 10.7.7.{{add 100 $i}}| Port {{ add 4000 $i }}
-| html5-frontend-{{$i}}| bbb-net | 10.7.7.{{add 200 $i}}| Port {{ add 4100 $i }}
-| freeswitch| network_mode: host | |
-| nginx | network_mode: host| |    extra_hosts: <br />      - "host.docker.internal:10.7.7.1"<br />      - "core:10.7.7.2"<br />      - "etherpad:10.7.7.4"<br />      - "webrtc-sfu:10.7.7.10"<br />      - "html5:10.7.7.11"
-| etherpad | bbb-net | 10.7.7.4|
-| redis | bbb-net | 10.7.7.5|
-| mongodb | bbb-net | 10.7.7.6|
-| kurento | network-mode: host | |
-| webrtc-sfu | bbb-net |  | network_mode: host
+| bbb-export-annotations | bbb-net | 10.7.7.19 |
+| redis | bbb-net | 10.7.7.5 |
+| webrtc-sfu | network_mode: host | |
 | fsesl-akka | bbb-net | 10.7.7.14 |
 | apps-akka | bbb-net | 10.7.7.15 |
-| libreoffice | bbb-net | 10.7.7.7 |
+| bbb-graphql-server | bbb-net | 10.7.7.31 |
+| bbb-graphql-actions | bbb-net | 10.7.7.30 |
+| bbb-graphql-middleware | bbb-net | 10.7.7.32 |
+| collabora | bbb-net | 10.7.7.20 |
 | periodic | bbb-net | 10.7.7.12 |
 | recordings | bbb-net | 10.7.7.16 |
+| bbb-webrtc-recorder | network_mode: host | |
 | webhooks | bbb-net | 10.7.7.17 |
-| https_proxy | bbb-net | |network_mode: host
+| haproxy | bbb-net | 10.7.7.35 |
 | coturn | network_mode: host | |
-| greenlight | | | ports: 10.7.7.1:5000:80
-| prometheus | bbb-net | 10.7.7.33 |
-| bbb-export-annotations | bbb-net | 10.7.7.19 |
+| greenlight | bbb-net | 10.7.7.21 |
+| postgres | bbb-net | 10.7.7.22 |
+| prometheus-exporter | bbb-net | 10.7.7.33 |
 
 ```yml
 networks:  

mod/bbb-export-annotations/config/settings.json

@@ -32,9 +32,9 @@
       }
     },
     "fonts": {
-      "draw": "/usr/local/share/fonts/CaveatBrush-Regular-2015-09-23.ttf",
-      "sans": "/usr/local/share/fonts/CrimsonPro[wght]-1.003.ttf",
-      "serif": "/usr/local/share/fonts/SourceSansPro-Regular-2.045.ttf",
-      "mono": "/usr/local/share/fonts/SourceCodePro-Regular-2.038.ttf"
+      "draw": "/usr/local/share/fonts/Shantell_Sans-Tldrawish.woff2",
+      "sans": "/usr/local/share/fonts/IBMPlexSans-Medium.woff2",
+      "serif": "/usr/local/share/fonts/IBMPlexSerif-Medium.woff2",
+      "mono": "/usr/local/share/fonts/IBMPlexMono-Medium.woff2"
   }
 }

mod/bbb-graphql-server/entrypoint.sh

@@ -11,9 +11,9 @@ export HASURA_GRAPHQL_DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWO
 export HASURA_GRAPHQL_METADATA_DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/hasura_app
 export HASURA_GRAPHQL_LOG_LEVEL=warn
 export HASURA_GRAPHQL_ENABLE_CONSOLE=false
-export HASURA_GRAPHQL_LIVE_QUERIES_MULTIPLEXED_REFETCH_INTERVAL=250
+export HASURA_GRAPHQL_LIVE_QUERIES_MULTIPLEXED_REFETCH_INTERVAL=333
 export HASURA_GRAPHQL_LIVE_QUERIES_MULTIPLEXED_BATCH_SIZE=1000
-export HASURA_GRAPHQL_STREAMING_QUERIES_MULTIPLEXED_REFETCH_INTERVAL=100
+export HASURA_GRAPHQL_STREAMING_QUERIES_MULTIPLEXED_REFETCH_INTERVAL=150
 export HASURA_GRAPHQL_STREAMING_QUERIES_MULTIPLEXED_BATCH_SIZE=1000
 export HASURA_GRAPHQL_SERVER_PORT=8085
 export HASURA_GRAPHQL_ENABLE_TELEMETRY=false

mod/bbb-pads/Dockerfile

@@ -1,7 +1,7 @@
 FROM node:22-bookworm-slim AS builder
 
 COPY --from=src / /bbb-pads
-RUN cd /bbb-pads && rm -r .git && npm install --production
+RUN cd /bbb-pads && npm install --production
 
 
 RUN chmod 777 /bbb-pads/config

mod/bbb-web/Dockerfile

@@ -16,10 +16,12 @@ RUN cd /bbb-common-web && ./deploy.sh
 COPY --from=src-web / /bbb-web
 
 # compile bbb-web
-RUN cd /bbb-web && grails assemble
+RUN cd /bbb-web && sh ./gradlew assemble
 
 # compile pres-checker
-RUN cd /bbb-web/pres-checker && gradle resolveDeps
+RUN cd /bbb-web/pres-checker && gradle jar
+RUN mkdir -p /bbb-web/pres-checker/lib && find /bbb-web/pres-checker && \
+    cp /bbb-web/pres-checker/build/libs/bbb-pres-check-0.0.1.jar /bbb-web/pres-checker/lib
 
 # extract .war
 RUN unzip -q /bbb-web/build/libs/bigbluebutton-0.10.0.war -d /dist
@@ -32,10 +34,10 @@ FROM alangecker/bbb-docker-base-java
 RUN mkdir -p /usr/share/bigbluebutton/blank \
     && cd /usr/share/bigbluebutton/blank \
     && wget \
-        https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.4.0/bigbluebutton-config/slides/blank-svg.svg \
-        https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.4.0/bigbluebutton-config/slides/blank-thumb.png \
-        https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.4.0/bigbluebutton-config/slides/blank-presentation.pdf \
-        https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.4.0/bigbluebutton-config/slides/blank-png.png \
+        https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v3.0.19/bigbluebutton-config/slides/blank-svg.svg \
+        https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v3.0.19/bigbluebutton-config/slides/blank-thumb.png \
+        https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v3.0.19/bigbluebutton-config/slides/blank-presentation.pdf \
+        https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v3.0.19/bigbluebutton-config/slides/blank-png.png \
     && sed -i 's/<policy domain="coder" rights="none" pattern="PDF" \/>/<policy domain="coder" rights="write" pattern="PDF" \/>/g' /etc/ImageMagick-6/policy.xml \
     && sed -i '/potrace/d' /etc/ImageMagick-6/delegates.xml
 
@@ -53,5 +55,6 @@ COPY bbb-web.properties /etc/bigbluebutton/bbb-web.properties.tmpl
 COPY turn-stun-servers.xml /etc/bigbluebutton/turn-stun-servers.xml.tmpl
 COPY logback.xml /usr/share/bbb-web/WEB-INF/classes/logback.xml
 COPY office-convert.sh /usr/share/bbb-libreoffice-conversion/convert.sh
+COPY run-in-systemd.sh /usr/share/bbb-web/run-in-systemd.sh
 
 ENTRYPOINT ["/entrypoint.sh"]

mod/bbb-web/bbb-web.properties

@@ -14,9 +14,7 @@ securitySalt={{ .Env.SHARED_SECRET }}
 redisHost=redis
 
 {{ if isTrue .Env.IGNORE_TLS_CERT_ERRORS }}
-beans.presentationService.defaultUploadedPresentation=https://test27.bigbluebutton.org/default.pdf
-# fetch presentations without HTTPS
-presentationBaseURL=http://{{ .Env.DOMAIN }}/bigbluebutton/presentation
+beans.presentationService.defaultUploadedPresentation=https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v3.0.19/bigbluebutton-config/assets/default.pdf
 {{else}}
 beans.presentationService.defaultUploadedPresentation=${bigbluebutton.web.serverURL}/default.pdf
 {{end}}

mod/bbb-web/entrypoint.sh

@@ -26,6 +26,6 @@ cd /usr/share/bbb-web/
 dockerize \
     -template /etc/bigbluebutton/bbb-web.properties.tmpl:/etc/bigbluebutton/bbb-web.properties \
     -template /etc/bigbluebutton/turn-stun-servers.xml.tmpl:/etc/bigbluebutton/turn-stun-servers.xml \
-    gosu bigbluebutton java -Dgrails.env=prod -Dserver.address=0.0.0.0 -Dserver.port=8090 -Dspring.main.allow-circular-references=true -Xms384m -Xmx384m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/bigbluebutton/diagnostics -cp WEB-INF/lib/*:/:WEB-INF/classes/:. org.springframework.boot.loader.WarLauncher
+    gosu bigbluebutton java -Dgrails.env=prod -Dserver.address=0.0.0.0 -Dserver.port=8090 -Dspring.main.allow-circular-references=true -Xms384m -Xmx384m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/bigbluebutton/diagnostics -cp WEB-INF/lib/*:/:WEB-INF/classes/:. org.springframework.boot.loader.launch.WarLauncher
 
 

mod/bbb-web/office-convert.sh

@@ -31,6 +31,6 @@ timeoutSecs="${timeoutSecs:0:3}"
 
 # The timeout is important.
 
-timeout $(printf %03d $timeoutSecs)s curl -F "data=@${source}" -k https://collabora:9980/cool/convert-to/$convertTo > "${dest}"
+timeout $(printf %03d $timeoutSecs)s curl -F "data=@${source}" -k $COLLABORA_URL/convert-to/$convertTo > "${dest}"
 
 exit 0