mirror of
https://github.com/bigbluebutton/docker.git
synced 2025-06-20 11:48:22 +02:00
Merge pull request #98 from bigbluebutton/updates/v2.3.0
🎉 Release v2.3.0
This commit is contained in:
commit
04acae934f
@ -1,6 +1,8 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
|
|
||||||
|
## Release v2.3.0
|
||||||
- :tada: **BigBlueButton 2.3** including all its changes
|
- :tada: **BigBlueButton 2.3** including all its changes
|
||||||
- Template based generation of docker-compose.yml [2.2.x#71](https://github.com/alangecker/bigbluebutton-docker/pull/71) [2.2.x#42](https://github.com/alangecker/bigbluebutton-docker/issues/42) @trickert76 @alangecker
|
- Template based generation of docker-compose.yml [2.2.x#71](https://github.com/alangecker/bigbluebutton-docker/pull/71) [2.2.x#42](https://github.com/alangecker/bigbluebutton-docker/issues/42) @trickert76 @alangecker
|
||||||
- Removal of `core` and all dependencies on the bigbluebutton ubuntu repository. Seperate container for `bbb-web`, `fsesl-akka` and `apps-akka` [2.2.x#26](https://github.com/alangecker/bigbluebutton-docker/issues/26) @alangecker
|
- Removal of `core` and all dependencies on the bigbluebutton ubuntu repository. Seperate container for `bbb-web`, `fsesl-akka` and `apps-akka` [2.2.x#26](https://github.com/alangecker/bigbluebutton-docker/issues/26) @alangecker
|
||||||
@ -9,7 +11,6 @@
|
|||||||
- Option for freeswitch language [2.2.x#85](https://github.com/alangecker/bigbluebutton-docker/pull/85) @alangecker @Daedalus3
|
- Option for freeswitch language [2.2.x#85](https://github.com/alangecker/bigbluebutton-docker/pull/85) @alangecker @Daedalus3
|
||||||
- Disabled integrated coturn [#73](https://github.com/bigbluebutton/docker/issues/73)
|
- Disabled integrated coturn [#73](https://github.com/bigbluebutton/docker/issues/73)
|
||||||
|
|
||||||
|
|
||||||
## Release v2.2.31-1 (2020-12-23) #84
|
## Release v2.2.31-1 (2020-12-23) #84
|
||||||
- Applied v2.2.31 changes @alangecker
|
- Applied v2.2.31 changes @alangecker
|
||||||
- Fix when presentation after recording unable to delete and change access rights #82 #63 @cardinalit
|
- Fix when presentation after recording unable to delete and change access rights #82 #63 @cardinalit
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# 📦 BigBlueButton 2.3 Docker
|
# 📦 BigBlueButton 2.3 Docker
|
||||||
|
|
||||||
Version: 2.3-rc-2 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues)
|
Version: 2.3.0 | [Changelog](CHANGELOG.md) | [Issues](https://github.com/bigbluebutton/docker/issues)
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
- Easy installation
|
- Easy installation
|
||||||
|
@ -202,6 +202,7 @@ services:
|
|||||||
FREESWITCH_IP: host.docker.internal
|
FREESWITCH_IP: host.docker.internal
|
||||||
FREESWITCH_SIP_IP: ${EXTERNAL_IPv4}
|
FREESWITCH_SIP_IP: ${EXTERNAL_IPv4}
|
||||||
ESL_IP: host.docker.internal
|
ESL_IP: host.docker.internal
|
||||||
|
ESL_PASSWORD: ${FSESL_PASSWORD:-ClueCon}
|
||||||
LOG_LEVEL: info
|
LOG_LEVEL: info
|
||||||
NODE_CONFIG: '{"kurento":[{"ip":"${EXTERNAL_IPv4}","url":"ws://kurento:8888/kurento"}]}'
|
NODE_CONFIG: '{"kurento":[{"ip":"${EXTERNAL_IPv4}","url":"ws://kurento:8888/kurento"}]}'
|
||||||
ports:
|
ports:
|
||||||
|
@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder
|
|||||||
RUN apt-get update && apt-get install -y subversion
|
RUN apt-get update && apt-get install -y subversion
|
||||||
|
|
||||||
# download bbb-common-message
|
# download bbb-common-message
|
||||||
ENV TAG_COMMON_MESSAGE v2.3-rc-2
|
ENV TAG_COMMON_MESSAGE v2.3.0
|
||||||
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
|
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
|
||||||
&& rm -rf /bbb-common-message/.svn
|
&& rm -rf /bbb-common-message/.svn
|
||||||
|
|
||||||
@ -14,7 +14,7 @@ RUN cd /bbb-common-message \
|
|||||||
|
|
||||||
# ===================================================
|
# ===================================================
|
||||||
|
|
||||||
ENV TAG v2.3-rc-2
|
ENV TAG v2.3.0
|
||||||
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-apps /source \
|
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-apps /source \
|
||||||
&& rm -rf /source/.svn
|
&& rm -rf /source/.svn
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder
|
|||||||
RUN apt-get update && apt-get install -y subversion
|
RUN apt-get update && apt-get install -y subversion
|
||||||
|
|
||||||
# download bbb-common-message
|
# download bbb-common-message
|
||||||
ENV TAG_COMMON_MESSAGE v2.3-rc-2
|
ENV TAG_COMMON_MESSAGE v2.3.0
|
||||||
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
|
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
|
||||||
&& rm -rf /bbb-common-message/.svn
|
&& rm -rf /bbb-common-message/.svn
|
||||||
|
|
||||||
@ -26,7 +26,7 @@ RUN cd /opt \
|
|||||||
ENV PATH="/opt/gradle-6.7/bin:${PATH}"
|
ENV PATH="/opt/gradle-6.7/bin:${PATH}"
|
||||||
|
|
||||||
# download bbb-common-web
|
# download bbb-common-web
|
||||||
ENV TAG_COMMON_WEB v2.3-rc-2
|
ENV TAG_COMMON_WEB v2.3.0
|
||||||
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_WEB/bbb-common-web /bbb-common-web \
|
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_WEB/bbb-common-web /bbb-common-web \
|
||||||
&& rm -rf /bbb-common-message/.svn
|
&& rm -rf /bbb-common-message/.svn
|
||||||
|
|
||||||
@ -35,7 +35,7 @@ RUN cd /bbb-common-web \
|
|||||||
&& ./deploy.sh
|
&& ./deploy.sh
|
||||||
|
|
||||||
# download bbb-web
|
# download bbb-web
|
||||||
ENV TAG_WEB v2.3-rc-2
|
ENV TAG_WEB v2.3.0
|
||||||
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_WEB/bigbluebutton-web /bbb-web \
|
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_WEB/bigbluebutton-web /bbb-web \
|
||||||
&& rm -rf /bbb-web/.svn
|
&& rm -rf /bbb-web/.svn
|
||||||
|
|
||||||
@ -77,10 +77,10 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
|
|||||||
RUN mkdir -p /usr/share/bigbluebutton/blank \
|
RUN mkdir -p /usr/share/bigbluebutton/blank \
|
||||||
&& cd /usr/share/bigbluebutton/blank \
|
&& cd /usr/share/bigbluebutton/blank \
|
||||||
&& wget \
|
&& wget \
|
||||||
https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3-alpha-2/bigbluebutton-config/slides/blank-svg.svg \
|
https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.0/bigbluebutton-config/slides/blank-svg.svg \
|
||||||
https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3-alpha-2/bigbluebutton-config/slides/blank-thumb.png \
|
https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.0/bigbluebutton-config/slides/blank-thumb.png \
|
||||||
https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3-alpha-2/bigbluebutton-config/slides/blank-presentation.pdf \
|
https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.0/bigbluebutton-config/slides/blank-presentation.pdf \
|
||||||
https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3-alpha-2/bigbluebutton-config/slides/blank-png.png \
|
https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.0/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 's/<policy domain="coder" rights="none" pattern="PDF" \/>/<policy domain="coder" rights="write" pattern="PDF" \/>/g' /etc/ImageMagick-6/policy.xml
|
||||||
|
|
||||||
# get bbb-web
|
# get bbb-web
|
||||||
|
@ -9,7 +9,7 @@ USER etherpad
|
|||||||
|
|
||||||
# only used to trigger a fresh run of the npm install
|
# only used to trigger a fresh run of the npm install
|
||||||
# command without caching
|
# command without caching
|
||||||
ENV TAG v2.3-beta-4
|
ENV TAG v2.3.0
|
||||||
|
|
||||||
RUN npm install \
|
RUN npm install \
|
||||||
git+https://git@github.com/pedrobmarin/ep_pad_ttl.git \
|
git+https://git@github.com/pedrobmarin/ep_pad_ttl.git \
|
||||||
|
@ -35,7 +35,7 @@ RUN apt-get update && apt-get install -y \
|
|||||||
# git sparse-checkout is not yet available with buster and there
|
# git sparse-checkout is not yet available with buster and there
|
||||||
# is no other sane way of downloading a single directory via git
|
# is no other sane way of downloading a single directory via git
|
||||||
|
|
||||||
ENV TAG v2.3-rc-1
|
ENV TAG v2.3.0
|
||||||
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bbb-voice-conference/config/freeswitch/conf /etc/freeswitch \
|
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bbb-voice-conference/config/freeswitch/conf /etc/freeswitch \
|
||||||
&& rm -rf /etc/freeswitch/.svn
|
&& rm -rf /etc/freeswitch/.svn
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<param name="nat-map" value="false"/>
|
<param name="nat-map" value="false"/>
|
||||||
<param name="listen-ip" value="$${local_ip_v4}"/>
|
<param name="listen-ip" value="$${local_ip_v4}"/>
|
||||||
<param name="listen-port" value="8021"/>
|
<param name="listen-port" value="8021"/>
|
||||||
<param name="password" value="ClueCon"/>
|
<param name="password" value="$${esl_password}"/>
|
||||||
<param name="apply-inbound-acl" value="loopback.custom"/>
|
<param name="apply-inbound-acl" value="loopback.custom"/>
|
||||||
<!--<param name="stop-on-bind-error" value="true"/>-->
|
<!--<param name="stop-on-bind-error" value="true"/>-->
|
||||||
</settings>
|
</settings>
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
<include>
|
<include>
|
||||||
|
<X-PRE-PROCESS cmd="set" data="esl_password={{ .Env.ESL_PASSWORD }}"/>
|
||||||
<!-- Preprocessor Variables
|
<!-- Preprocessor Variables
|
||||||
These are introduced when configuration strings must be consistent across modules.
|
These are introduced when configuration strings must be consistent across modules.
|
||||||
NOTICE: YOU CAN NOT COMMENT OUT AN X-PRE-PROCESS line, Remove the line instead.
|
NOTICE: YOU CAN NOT COMMENT OUT AN X-PRE-PROCESS line, Remove the line instead.
|
||||||
|
@ -3,7 +3,7 @@ FROM mozilla/sbt:8u181_1.2.7 AS builder
|
|||||||
RUN apt-get update && apt-get install -y subversion
|
RUN apt-get update && apt-get install -y subversion
|
||||||
|
|
||||||
# download bbb-common-message
|
# download bbb-common-message
|
||||||
ENV TAG_COMMON_MESSAGE v2.3-rc-2
|
ENV TAG_COMMON_MESSAGE v2.3.0
|
||||||
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
|
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
|
||||||
&& rm -rf /bbb-common-message/.svn
|
&& rm -rf /bbb-common-message/.svn
|
||||||
|
|
||||||
@ -13,7 +13,7 @@ RUN cd /bbb-common-message \
|
|||||||
|
|
||||||
|
|
||||||
# ===================================================
|
# ===================================================
|
||||||
ENV TAG_FSESL v2.3-rc-2
|
ENV TAG_FSESL v2.3.0
|
||||||
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_FSESL/bbb-fsesl-client /bbb-fsesl-client \
|
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_FSESL/bbb-fsesl-client /bbb-fsesl-client \
|
||||||
&& rm -rf /bbb-fsesl-client/.svn
|
&& rm -rf /bbb-fsesl-client/.svn
|
||||||
|
|
||||||
@ -21,7 +21,7 @@ RUN cd /bbb-fsesl-client \
|
|||||||
&& ./deploy.sh
|
&& ./deploy.sh
|
||||||
|
|
||||||
|
|
||||||
ENV TAG v2.3-rc-2
|
ENV TAG v2.3.0
|
||||||
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-fsesl /source \
|
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-fsesl /source \
|
||||||
&& rm -rf /source/.svn
|
&& rm -rf /source/.svn
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ USER meteor
|
|||||||
ENV METEOR_VERSION 1.10.2
|
ENV METEOR_VERSION 1.10.2
|
||||||
RUN curl -sL https://install.meteor.com?release=$METEOR_VERSION | sed s/--progress-bar/-sL/g | /bin/sh
|
RUN curl -sL https://install.meteor.com?release=$METEOR_VERSION | sed s/--progress-bar/-sL/g | /bin/sh
|
||||||
|
|
||||||
ENV TAG v2.3-rc-2
|
ENV TAG v2.3.0
|
||||||
RUN cd ~ \
|
RUN cd ~ \
|
||||||
&& svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \
|
&& svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \
|
||||||
&& mv ~/bigbluebutton-html5 ~/source \
|
&& mv ~/bigbluebutton-html5 ~/source \
|
||||||
@ -41,4 +41,4 @@ COPY settings.yml /app/programs/server/assets/app/config/settings.yml.tmpl
|
|||||||
ENTRYPOINT ["/entrypoint.sh"]
|
ENTRYPOINT ["/entrypoint.sh"]
|
||||||
|
|
||||||
# lets set the tag again, so that it is include in the image for later version retrieval
|
# lets set the tag again, so that it is include in the image for later version retrieval
|
||||||
ENV TAG v2.3-rc-2
|
ENV TAG v2.3.0
|
||||||
|
@ -20,7 +20,7 @@ public:
|
|||||||
appName: BigBlueButton HTML5 Client
|
appName: BigBlueButton HTML5 Client
|
||||||
bbbServerVersion: 2.3-dev-docker
|
bbbServerVersion: 2.3-dev-docker
|
||||||
copyright: '©2021 BigBlueButton Inc.'
|
copyright: '©2021 BigBlueButton Inc.'
|
||||||
html5ClientBuild: "1654-docker"
|
html5ClientBuild: "1669-docker"
|
||||||
helpLink: https://bigbluebutton.org/html5/
|
helpLink: https://bigbluebutton.org/html5/
|
||||||
lockOnJoin: true
|
lockOnJoin: true
|
||||||
cdn: ''
|
cdn: ''
|
||||||
@ -360,6 +360,7 @@ public:
|
|||||||
enabled: true
|
enabled: true
|
||||||
max_custom: 5
|
max_custom: 5
|
||||||
allowDragAndDropFile: false
|
allowDragAndDropFile: false
|
||||||
|
maxTypedAnswerLength: 45
|
||||||
captions:
|
captions:
|
||||||
enabled: true
|
enabled: true
|
||||||
enableDictation: false
|
enableDictation: false
|
||||||
@ -463,8 +464,6 @@ public:
|
|||||||
panZoomThrottle: 32
|
panZoomThrottle: 32
|
||||||
restoreOnUpdate: false
|
restoreOnUpdate: false
|
||||||
uploadEndpoint: '/bigbluebutton/presentation/upload'
|
uploadEndpoint: '/bigbluebutton/presentation/upload'
|
||||||
uploadSizeMin: 0
|
|
||||||
uploadSizeMax: 50000000
|
|
||||||
uploadValidMimeTypes:
|
uploadValidMimeTypes:
|
||||||
- extension: .pdf
|
- extension: .pdf
|
||||||
mime: application/pdf
|
mime: application/pdf
|
||||||
@ -504,6 +503,7 @@ public:
|
|||||||
mime: image/png
|
mime: image/png
|
||||||
selectRandomUser:
|
selectRandomUser:
|
||||||
enabled: true
|
enabled: true
|
||||||
|
countdown: false
|
||||||
user:
|
user:
|
||||||
role_moderator: MODERATOR
|
role_moderator: MODERATOR
|
||||||
role_viewer: VIEWER
|
role_viewer: VIEWER
|
||||||
|
@ -2,9 +2,11 @@ FROM eugenmayer/jodconverter:rest
|
|||||||
RUN echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections
|
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 && apt-get update
|
||||||
RUN apt-get update && apt -y install --no-install-recommends \
|
RUN apt-get update && apt -y install --no-install-recommends \
|
||||||
|
fonts-arkpandora \
|
||||||
fonts-crosextra-carlito \
|
fonts-crosextra-carlito \
|
||||||
fonts-crosextra-caladea \
|
fonts-crosextra-caladea \
|
||||||
fonts-noto \
|
fonts-noto \
|
||||||
fonts-noto-cjk \
|
fonts-noto-cjk \
|
||||||
|
fonts-liberation \
|
||||||
fontconfig \
|
fontconfig \
|
||||||
ttf-mscorefonts-installer
|
ttf-mscorefonts-installer
|
@ -45,7 +45,7 @@ RUN mkdir -p \
|
|||||||
/usr/local/bigbluebutton/core \
|
/usr/local/bigbluebutton/core \
|
||||||
/etc/bigbluebutton
|
/etc/bigbluebutton
|
||||||
|
|
||||||
ENV TAG v2.3-beta-4
|
ENV TAG v2.3.0
|
||||||
|
|
||||||
# add bbb-record-core (lib, scripts and Gemfile)
|
# add bbb-record-core (lib, scripts and Gemfile)
|
||||||
RUN cd /usr/local/bigbluebutton/core \
|
RUN cd /usr/local/bigbluebutton/core \
|
||||||
|
@ -13,7 +13,7 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
|
|||||||
USER webhooks
|
USER webhooks
|
||||||
|
|
||||||
|
|
||||||
ENV TAG v2.3-rc-2
|
ENV TAG v2.3.0
|
||||||
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bbb-webhooks /app \
|
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bbb-webhooks /app \
|
||||||
&& rm -rf /app/.svn \
|
&& rm -rf /app/.svn \
|
||||||
&& cd /app && npm install --production
|
&& cd /app && npm install --production
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit f8a883850c235da2d9cca330b4f1ec09afc6d96c
|
Subproject commit 4145f8c1ad9e111bf0d3fe037e9d3be965fe1232
|
Loading…
x
Reference in New Issue
Block a user