mirror of
https://github.com/bigbluebutton/docker.git
synced 2025-08-14 14:58:31 +02:00
Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
ef295301b5 | |||
cef23f8236 | |||
d8587b0e33 | |||
81c3cacf29 | |||
f30496d430 | |||
f2fe7959bb | |||
bfa6679ff0 | |||
fc74f2a8b8 | |||
c181ee9665 | |||
ad6b0d2d38 |
@ -1,7 +1,10 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
- BBB 2.5.4 @alangecker
|
|
||||||
|
## Release v2.5.8 (2022-11-06)
|
||||||
|
- BBB 2.5.8 @alangecker [#238](https://github.com/bigbluebutton/docker/pull/238)
|
||||||
|
- recordings: fix for missing ffmpeg filter @alangecker [#235](https://github.com/bigbluebutton/docker/issues/235) [#230](https://github.com/bigbluebutton/docker/pull/230)
|
||||||
|
|
||||||
## Release v2.5.0 (2022-06-10)
|
## Release v2.5.0 (2022-06-10)
|
||||||
- BigBlueButton v2.5 @alangecker [#207](https://github.com/bigbluebutton/docker/pull/207)
|
- BigBlueButton v2.5 @alangecker [#207](https://github.com/bigbluebutton/docker/pull/207)
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
# 📦 BigBlueButton 2.5 Docker
|
# 📦 BigBlueButton 2.5 Docker
|
||||||
|
|
||||||
Version: 2.5.2 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues)
|
Version: 2.5.8 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues)
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
- Easy installation
|
- Easy installation
|
||||||
|
@ -136,7 +136,7 @@ services:
|
|||||||
context: mod/nginx
|
context: mod/nginx
|
||||||
args:
|
args:
|
||||||
TAG_LEARNING_DASHBOARD: {{ .Env.TAG_LEARNING_DASHBOARD }}
|
TAG_LEARNING_DASHBOARD: {{ .Env.TAG_LEARNING_DASHBOARD }}
|
||||||
image: alangecker/bbb-docker-nginx:1.21-{{ .Env.TAG_PLAYBACK }}-{{ .Env.TAG_LEARNING_DASHBOARD }}
|
image: alangecker/bbb-docker-nginx:1.23-{{ .Env.TAG_PLAYBACK }}-{{ .Env.TAG_LEARNING_DASHBOARD }}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
- etherpad
|
- etherpad
|
||||||
@ -210,7 +210,7 @@ services:
|
|||||||
|
|
||||||
# TODO: remove as soon as not required anymore by webrtc-sfu
|
# TODO: remove as soon as not required anymore by webrtc-sfu
|
||||||
kurento:
|
kurento:
|
||||||
image: kurento/kurento-media-server:6.17
|
image: kurento/kurento-media-server:6.18
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
network_mode: host
|
network_mode: host
|
||||||
volumes:
|
volumes:
|
||||||
@ -288,6 +288,8 @@ services:
|
|||||||
jodconverter:
|
jodconverter:
|
||||||
build: mod/jodconverter
|
build: mod/jodconverter
|
||||||
image: alangecker/bbb-docker-jodconverter:latest
|
image: alangecker/bbb-docker-jodconverter:latest
|
||||||
|
security_opt:
|
||||||
|
- 'no-new-privileges:true'
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
tmpfs:
|
tmpfs:
|
||||||
- /tmp
|
- /tmp
|
||||||
|
Submodule mod/bbb-pads/bbb-pads updated: 3eb45a5099...61f89b6202
@ -24,6 +24,6 @@ cd /usr/share/bbb-web/
|
|||||||
dockerize \
|
dockerize \
|
||||||
-template /etc/bigbluebutton/bbb-web.properties.tmpl:/etc/bigbluebutton/bbb-web.properties \
|
-template /etc/bigbluebutton/bbb-web.properties.tmpl:/etc/bigbluebutton/bbb-web.properties \
|
||||||
-template /usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml.tmpl:/usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml \
|
-template /usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml.tmpl:/usr/share/bbb-web/WEB-INF/classes/spring/turn-stun-servers.xml \
|
||||||
gosu bigbluebutton java -Dgrails.env=prod -Dserver.address=0.0.0.0 -Dserver.port=8090 -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.WarLauncher
|
||||||
|
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
<!-- Domain (for presence) -->
|
<!-- Domain (for presence) -->
|
||||||
<param name="domain" value="$${domain}"/>
|
<param name="domain" value="$${domain}"/>
|
||||||
<!-- Sample Rate-->
|
<!-- Sample Rate-->
|
||||||
<param name="rate" value="8000"/>
|
<param name="rate" value="48000"/>
|
||||||
<!-- Number of milliseconds per frame -->
|
<!-- Number of milliseconds per frame -->
|
||||||
<param name="interval" value="20"/>
|
<param name="interval" value="20"/>
|
||||||
<!-- Energy level required for audio to be sent to the other users -->
|
<!-- Energy level required for audio to be sent to the other users -->
|
||||||
|
@ -21,7 +21,7 @@ RUN sed -i "s/VERSION/$TAG_HTML5/" /app/bundle/programs/web.browser/head.html \
|
|||||||
|
|
||||||
# ------------------------------
|
# ------------------------------
|
||||||
|
|
||||||
FROM node:14.19.1-alpine
|
FROM node:14.21.1-alpine
|
||||||
|
|
||||||
RUN addgroup -g 2000 meteor && \
|
RUN addgroup -g 2000 meteor && \
|
||||||
adduser -D -u 2001 -G meteor meteor && \
|
adduser -D -u 2001 -G meteor meteor && \
|
||||||
|
@ -6,12 +6,12 @@ export MONGO_OPLOG_URL=mongodb://10.7.7.6/local
|
|||||||
export MONGO_URL=mongodb://10.7.7.6/meteor
|
export MONGO_URL=mongodb://10.7.7.6/meteor
|
||||||
export ROOT_URL=http://127.0.0.1/html5client
|
export ROOT_URL=http://127.0.0.1/html5client
|
||||||
export NODE_ENV=production
|
export NODE_ENV=production
|
||||||
export SERVER_WEBSOCKET_COMPRESSION=0
|
export SERVER_WEBSOCKET_COMPRESSION='{"level":5, "maxWindowBits":13, "memLevel":7, "requestMaxWindowBits":13}'
|
||||||
export BIND_IP=0.0.0.0
|
export BIND_IP=0.0.0.0
|
||||||
export LANG=en_US.UTF-8
|
export LANG=en_US.UTF-8
|
||||||
export INSTANCE_MAX=1
|
export INSTANCE_MAX=1
|
||||||
export ENVIRONMENT_TYPE=production
|
export ENVIRONMENT_TYPE=production
|
||||||
export NODE_VERSION=node-v14.19.1-linux-x64
|
export NODE_VERSION=node-v14.21.1-linux-x64
|
||||||
export BBB_HTML5_LOCAL_SETTINGS=/app/bbb-html5.yml
|
export BBB_HTML5_LOCAL_SETTINGS=/app/bbb-html5.yml
|
||||||
|
|
||||||
if [ "$DEV_MODE" == true ]; then
|
if [ "$DEV_MODE" == true ]; then
|
||||||
|
@ -13,7 +13,7 @@ RUN cd /bbb-playback && npm ci && npm run build
|
|||||||
|
|
||||||
# --------------------
|
# --------------------
|
||||||
|
|
||||||
FROM nginx:1.21-alpine
|
FROM nginx:1.23-alpine
|
||||||
|
|
||||||
COPY --from=builder /bbb-learning-dashboard/build /www/learning-analytics-dashboard/
|
COPY --from=builder /bbb-learning-dashboard/build /www/learning-analytics-dashboard/
|
||||||
COPY --from=builder /bbb-playback/build /www/playback/presentation/2.3
|
COPY --from=builder /bbb-playback/build /www/playback/presentation/2.3
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
FROM ruby:2.7-slim-buster
|
FROM ruby:2.7-slim-bullseye
|
||||||
|
|
||||||
# install apt dependencies
|
# install apt dependencies
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
|
Submodule mod/webrtc-sfu/bbb-webrtc-sfu updated: 07723a95bf...e7c08cf8a7
@ -7,13 +7,18 @@
|
|||||||
set -e
|
set -e
|
||||||
cd "$(dirname "$0")/.."
|
cd "$(dirname "$0")/.."
|
||||||
|
|
||||||
|
git submodule init
|
||||||
|
git submodule update
|
||||||
|
|
||||||
export $(cat tags.env | sed 's/#.*//g' | xargs)
|
export $(cat tags.env | sed 's/#.*//g' | xargs)
|
||||||
|
|
||||||
function checkout {
|
function checkout {
|
||||||
path=$1
|
path=$1
|
||||||
ref=$2
|
ref=$2
|
||||||
pushd $path
|
pushd $path
|
||||||
|
git fetch
|
||||||
git checkout $ref
|
git checkout $ref
|
||||||
|
echo ""
|
||||||
popd > /dev/null
|
popd > /dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,8 +17,7 @@ else
|
|||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "# pull newest git submodules"
|
echo "# pull newest git submodules"
|
||||||
git submodule init
|
./scripts/checkout-submodules
|
||||||
git submodule update
|
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "# recreate docker-compose.yml"
|
echo "# recreate docker-compose.yml"
|
||||||
|
22
tags.env
22
tags.env
@ -4,24 +4,24 @@
|
|||||||
|
|
||||||
|
|
||||||
# https://gitlab.senfcall.de/senfcall-public/docker-bbb-build
|
# https://gitlab.senfcall.de/senfcall-public/docker-bbb-build
|
||||||
BBB_BUILD_TAG=v2022-03-30
|
BBB_BUILD_TAG=v2022-12-08-meteor-290
|
||||||
|
|
||||||
# https://github.com/bigbluebutton/bigbluebutton
|
# https://github.com/bigbluebutton/bigbluebutton
|
||||||
TAG_COMMON_MESSAGE=v2.5.5
|
TAG_COMMON_MESSAGE=v2.5.10
|
||||||
TAG_APPS_AKKA=v2.5.5
|
TAG_APPS_AKKA=v2.5.10
|
||||||
TAG_FSESL_AKKA=v2.5.5
|
TAG_FSESL_AKKA=v2.5.10
|
||||||
TAG_BBB_WEB=v2.5.5
|
TAG_BBB_WEB=v2.5.11
|
||||||
TAG_HTML5=v2.5.5
|
TAG_HTML5=v2.5.10
|
||||||
TAG_RECORDINGS=v2.5.5
|
TAG_RECORDINGS=v2.5.10
|
||||||
|
|
||||||
TAG_LEARNING_DASHBOARD=v2.5.5
|
TAG_LEARNING_DASHBOARD=v2.5.10
|
||||||
TAG_FS_CONFIG=v2.5.0
|
TAG_FS_CONFIG=v2.5.7
|
||||||
|
|
||||||
|
|
||||||
# individual git submodules
|
# individual git submodules
|
||||||
# use `./scripts/checkout-submodules` to ensure, that the submodules
|
# use `./scripts/checkout-submodules` to ensure, that the submodules
|
||||||
# match the provided tags here
|
# match the provided tags here
|
||||||
TAG_WEBRTC_SFU=v2.8.2
|
TAG_WEBRTC_SFU=v2.8.7
|
||||||
TAG_WEBHOOKS=v2.6.0
|
TAG_WEBHOOKS=v2.6.0
|
||||||
TAG_PLAYBACK=v4.0.0
|
TAG_PLAYBACK=v4.0.0
|
||||||
TAG_PADS=v1.2.1
|
TAG_PADS=v1.4.0
|
Reference in New Issue
Block a user