mirror of
https://github.com/bigbluebutton/docker.git
synced 2025-08-15 15:22:33 +02:00
applied v2.3-alpha 7 changes incl. html5 load balancing
This commit is contained in:
chandi
@ -14,13 +14,13 @@ USER meteor
|
||||
ENV METEOR_VERSION 1.10.2
|
||||
RUN curl -sL https://install.meteor.com?release=$METEOR_VERSION | sed s/--progress-bar/-sL/g | /bin/sh
|
||||
|
||||
ENV TAG v2.3-alpha-6
|
||||
ENV TAG v2.3-alpha-7
|
||||
RUN cd ~ \
|
||||
&& svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bigbluebutton-html5 \
|
||||
&& mv ~/bigbluebutton-html5 ~/source \
|
||||
&& cd ~/source \
|
||||
&& ~/.meteor/meteor npm install --production \
|
||||
&& ~/.meteor/meteor build --directory ~/app \
|
||||
&& METEOR_DISABLE_OPTIMISTIC_CACHING=1 ~/.meteor/meteor build --directory ~/app \
|
||||
&& rm -rf ~/source
|
||||
|
||||
RUN cd ~/app/bundle/programs/server \
|
||||
@ -41,4 +41,4 @@ COPY settings.yml /app/programs/server/assets/app/config/settings.yml.tmpl
|
||||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# lets set the tag again, so that it is include in the image for later version retrieval
|
||||
ENV TAG v2.3-alpha-6
|
||||
ENV TAG v2.3-alpha-7
|
||||
|
||||
@ -4,6 +4,7 @@ set -e
|
||||
cd /app
|
||||
export MONGO_OPLOG_URL=mongodb://10.7.7.6/local
|
||||
export MONGO_URL=mongodb://10.7.7.6/meteor
|
||||
export ROOT_URL=http://127.0.0.1/html5client
|
||||
export NODE_ENV=production
|
||||
export SERVER_WEBSOCKET_COMPRESSION=0
|
||||
export BIND_IP=0.0.0.0
|
||||
@ -17,24 +18,26 @@ if [ "$DEV_MODE" == true ]; then
|
||||
export NODE_TLS_REJECT_UNAUTHORIZED=0
|
||||
fi
|
||||
|
||||
# copy static files into volume for direct access by nginx
|
||||
# https://github.com/bigbluebutton/bigbluebutton/issues/10739
|
||||
if [ -d "/html5-static" ]; then
|
||||
rm -rf /html5-static/*
|
||||
cp -r /app/programs/web.browser/* /html5-static
|
||||
if [ "$BBB_HTML5_ROLE" == "backend" ]; then
|
||||
PARAM=NODEJS_BACKEND_INSTANCE_ID=$INSTANCE_ID
|
||||
fi
|
||||
|
||||
|
||||
# TODO: start multiple instances (introduced with v2.3-alpha-3)
|
||||
# https://github.com/bigbluebutton/bigbluebutton/releases/tag/v2.3-alpha-3
|
||||
# if container is the first frontend, do some additional tasks
|
||||
if [ "$BBB_HTML5_ROLE" == "frontend" ] && [ "$INSTANCE_ID" == "1" ]; then
|
||||
# delete potential old settings.yml
|
||||
|
||||
export INSTANCE_ID=1
|
||||
export ROOT_URL=http://127.0.0.1/html5client/$INSTANCE_ID
|
||||
export PORT=4000
|
||||
# copy static files into volume for direct access by nginx
|
||||
# https://github.com/bigbluebutton/bigbluebutton/issues/10739
|
||||
if [ -d "/html5-static" ]; then
|
||||
rm -rf /html5-static/*
|
||||
cp -r /app/programs/web.browser/* /html5-static
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
rm -f /app/programs/server/assets/app/config/settings.yml
|
||||
dockerize \
|
||||
-template /app/programs/server/assets/app/config/settings.yml.tmpl:/app/programs/server/assets/app/config/settings.yml \
|
||||
nice -n-2 \
|
||||
su-exec meteor \
|
||||
node --max-old-space-size=2048 --max_semi_space_size=128 main.js
|
||||
su-exec meteor \
|
||||
node --max-old-space-size=2048 --max_semi_space_size=128 main.js $PARAM
|
||||
|
||||
@ -12,7 +12,7 @@ public:
|
||||
appName: BigBlueButton HTML5 Client
|
||||
bbbServerVersion: 2.3-dev-docker
|
||||
copyright: '©2021 BigBlueButton Inc.'
|
||||
html5ClientBuild: "1353-docker"
|
||||
html5ClientBuild: "1394-docker"
|
||||
helpLink: https://bigbluebutton.org/html5/
|
||||
lockOnJoin: true
|
||||
cdn: ''
|
||||
@ -43,7 +43,9 @@ public:
|
||||
# Warning: increasing the limit of breakout rooms per meeting
|
||||
# can generate excessive overhead to the server. We recommend
|
||||
# this value to be kept under 12.
|
||||
breakoutRoomLimit: {{ .Env.BREAKOUTROOM_LIMIT }}
|
||||
breakouts:
|
||||
breakoutRoomLimit: {{ .Env.BREAKOUTROOM_LIMIT }}
|
||||
sendInvitationToIncludedModerators: false
|
||||
# https://github.com/bigbluebutton/bigbluebutton/pull/10826
|
||||
customHeartbeat: true
|
||||
defaultSettings:
|
||||
@ -263,7 +265,7 @@ public:
|
||||
profile: low-u30
|
||||
pagination:
|
||||
# whether to globally enable or disable pagination.
|
||||
enabled: false
|
||||
enabled: true
|
||||
# how long (in ms) the negotiation will be debounced after a page change.
|
||||
pageChangeDebounceTime: 2500
|
||||
# video page sizes for DESKTOP endpoints. It stands for the number of SUBSCRIBER streams.
|
||||
@ -271,11 +273,11 @@ public:
|
||||
# A page size of 0 (zero) means that the page size is unlimited (disabled).
|
||||
desktopPageSizes:
|
||||
moderator: 0
|
||||
viewer: 5
|
||||
viewer: 0
|
||||
# video page sizes for MOBILE endpoints
|
||||
mobilePageSizes:
|
||||
moderator: 2
|
||||
viewer: 2
|
||||
moderator: 6
|
||||
viewer: 4
|
||||
syncUsersWithConnectionManager:
|
||||
enabled: false
|
||||
syncInterval: 60000
|
||||
@ -314,6 +316,7 @@ public:
|
||||
storage_key: UNREAD_CHATS
|
||||
system_messages_keys:
|
||||
chat_clear: PUBLIC_CHAT_CLEAR
|
||||
chat_poll_result: PUBLIC_CHAT_POLL_RESULT
|
||||
typingIndicator:
|
||||
enabled: true
|
||||
note:
|
||||
@ -328,6 +331,7 @@ public:
|
||||
layout:
|
||||
autoSwapLayout: false
|
||||
hidePresentation: false
|
||||
showParticipantsOnLogin: true
|
||||
webcamsDefaultPlacement: 'top'
|
||||
media:
|
||||
stunTurnServersFetchAddress: '/bigbluebutton/api/stuns'
|
||||
@ -553,7 +557,7 @@ private:
|
||||
toThirdParty: to-third-party-redis-channel
|
||||
subscribeTo:
|
||||
- to-html5-redis-channel
|
||||
- from-akka-apps-*
|
||||
- from-akka-apps-[^f]*
|
||||
- from-third-party-redis-channel
|
||||
- from-etherpad-redis-channel
|
||||
async:
|
||||
@ -599,3 +603,4 @@ private:
|
||||
version: 10
|
||||
- browser: YandexBrowser
|
||||
version: 19
|
||||
|
||||
Reference in New Issue
Block a user