extern/docker
1
0
Fork 1
mirror of https://github.com/bigbluebutton/docker.git synced 2024-11-26 10:03:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Applied v2.2.30 changes

Browse Source
This commit is contained in:
chandi 2020-11-30 16:55:54 +01:00
parent 9b757289a2
commit 49a5af5b91
7 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,7 +1,7 @@
# Changelog # Changelog
## Unreleased ## Unreleased
## Release v2.2.29-1 (2020-11-23) - Applied v2.2.30 changes @alangecker
- Applied v2.2.29 changes @alangecker - Applied v2.2.29 changes @alangecker
## Release v2.2.28-1 (2020-10-22) #67 ## Release v2.2.28-1 (2020-10-22) #67

2
bbb-webrtc-sfu

@ -1 +1 @@
Subproject commit 49a515238114fe7e4bec3aa94af2e7c9f511f4a7 Subproject commit 0ea5bd5d14f3d96c6f5ce4b5c238fbdef82e6d87

2
docker-compose.prometheus.yml
View File

@ -2,7 +2,7 @@ version: '3.6'
services: services:
prometheus-exporter: prometheus-exporter:
image: greenstatic/bigbluebutton-exporter:v0.5.2 image: greenstatic/bigbluebutton-exporter:v0.6.0
restart: unless-stopped restart: unless-stopped
environment: environment:
API_BASE_URL: http://10.7.7.1:8080/bigbluebutton/api/ API_BASE_URL: http://10.7.7.1:8080/bigbluebutton/api/

2
docker-compose.yml
View File

@ -93,7 +93,7 @@ services:
ipv4_address: 10.7.7.6 ipv4_address: 10.7.7.6
kurento: kurento:
image: kurento/kurento-media-server:6.14 image: kurento/kurento-media-server:6.15
restart: unless-stopped restart: unless-stopped
environment: environment:
KMS_STUN_IP: ${STUN_IP} KMS_STUN_IP: ${STUN_IP}

4
mod/html5/Dockerfile
View File

@ -14,7 +14,7 @@ USER meteor
ENV METEOR_VERSION 1.8.1 ENV METEOR_VERSION 1.8.1
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.2.29 ENV TAG v2.2.30
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 \
@ -51,4 +51,4 @@ USER meteor
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.2.29 ENV TAG v2.2.30

5
mod/html5/settings.yml
View File

@ -11,7 +11,7 @@ public:
appName: BigBlueButton HTML5 Client appName: BigBlueButton HTML5 Client
bbbServerVersion: 2.2 bbbServerVersion: 2.2
copyright: "©2020 BigBlueButton Inc." copyright: "©2020 BigBlueButton Inc."
html5ClientBuild: 1081 html5ClientBuild: 1095
helpLink: https://bigbluebutton.org/html5/ helpLink: https://bigbluebutton.org/html5/
lockOnJoin: true lockOnJoin: true
cdn: "" cdn: ""
@ -36,6 +36,7 @@ public:
# can generate excessive overhead to the server. We recommend # can generate excessive overhead to the server. We recommend
# this value to be kept under 12. # this value to be kept under 12.
breakoutRoomLimit: {{ .Env.BREAKOUTROOM_LIMIT }} breakoutRoomLimit: {{ .Env.BREAKOUTROOM_LIMIT }}
customHeartbeat: false
defaultSettings: defaultSettings:
application: application:
animations: true animations: true
@ -419,7 +420,7 @@ public:
- pencil - pencil
- hand - hand
clientLog: clientLog:
server: { enabled: true, level: info } server: { enabled: false, level: info }
console: { enabled: true, level: debug } console: { enabled: true, level: debug }
external: { enabled: false, level: info, url: https://LOG_HOST/html5Log, method: POST, throttleInterval: 400, flushOnClose: true, logTag: "" } external: { enabled: false, level: info, url: https://LOG_HOST/html5Log, method: POST, throttleInterval: 400, flushOnClose: true, logTag: "" }
private: private:

2
mod/recordings/Dockerfile
View File

@ -40,7 +40,7 @@ RUN mkdir -p \
/var/log/bigbluebutton \ /var/log/bigbluebutton \
/var/log/bigbluebutton/presentation /var/log/bigbluebutton/presentation
ENV TAG v2.2.27 ENV TAG v2.2.30
# 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 \