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

changes for v2.2.7

Browse Source
This commit is contained in:
chandi 2020-04-29 16:35:03 +02:00
parent 924cb4fd4b
commit cf680ca859
5 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bbb-webrtc-sfu

@ -1 +1 @@
Subproject commit e8c232f71c3db503f6b358ef0ca6b2abd75df080
Subproject commit 400fe636e63563437fb112c2df0261d6be9f103e

4
mod/core/Dockerfile
View File

@ -29,7 +29,7 @@ RUN apt-get install -y systemd apt-transport-https equivs libreoffice haveged tt
# bbb repo & packages
RUN LC_CTYPE=C.UTF-8 add-apt-repository ppa:bigbluebutton/support
RUN sh -c 'wget https://ubuntu.bigbluebutton.org/repo/bigbluebutton.asc -O- | apt-key add -' \
&& sh -c 'echo "deb https://ubuntu.bigbluebutton.org/xenial-220 bigbluebutton-xenial main" > /etc/apt/sources.list.d/bigbluebutton.list' \
&& sh -c 'echo "deb https://packages-eu.bigbluebutton.org/xenial-22 bigbluebutton-xenial main" > /etc/apt/sources.list.d/bigbluebutton.list' \
&& apt-get update
# create dummy packages to satisfy dependencies
@ -78,7 +78,7 @@ COPY freeswitch/dialplan_public.xml /opt/freeswitch/conf/dialplan/public.xml
COPY web/bigbluebutton.properties /usr/share/bbb-web/WEB-INF/classes/bigbluebutton.properties.tmpl
COPY bbb-apps-akka/application.conf /usr/share/bbb-apps-akka/conf/application.conf.tmpl
COPY bbb-fsesl-akka/application.conf /etc/bbb-fsesl-akka/application.conf
COPY web-run.sh /usr/share/bbb-web/run-prod.sh
ENTRYPOINT ["/entrypoint.sh"]
CMD []

4
mod/core/web-run.sh Executable file
View File

@ -0,0 +1,4 @@
#!/bin/bash
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

4
mod/html5/Dockerfile
View File

@ -13,8 +13,8 @@ RUN apt-get update && apt-get install -y wget binutils
RUN useradd -m meteor
# download & install bbb-html5 package manually
RUN PACKAGE_PATH=$(curl -s https://ubuntu.bigbluebutton.org/xenial-220/dists/bigbluebutton-xenial/main/binary-amd64/Packages | grep -E 'Filename.*html5' | awk '{print $2}') \
&& wget https://ubuntu.bigbluebutton.org/xenial-220/$PACKAGE_PATH \
RUN PACKAGE_PATH=$(curl -s https://packages-eu.bigbluebutton.org/xenial-22/dists/bigbluebutton-xenial/main/binary-amd64/Packages | grep -E 'Filename.*html5' | awk '{print $2}') \
&& wget https://packages-eu.bigbluebutton.org/xenial-22/$PACKAGE_PATH \
&& ar x bbb-html5_*.deb \
&& tar -zxf data.tar.gz ./usr/share/meteor/bundle \
&& mv /usr/share/meteor/bundle /app \

14
mod/nginx/bbb/web.nginx
View File

@ -42,6 +42,20 @@
}
location /bigbluebutton/presentation/download {
return 404;
}
location ~ "^/bigbluebutton/presentation/download\/[0-9a-f]+-[0-9]+/[0-9a-f]+-[0-9]+$" {
if ($arg_presFilename !~ "^[0-9a-zA-Z]+\.[0-9a-zA-Z]+$") {
return 404;
}
proxy_pass http://host.docker.internal:8090$uri$is_args$args;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# Workaround IE refusal to set cookies in iframe
add_header P3P 'CP="No P3P policy available"';
}
location = /bigbluebutton/presentation/checkPresentation {
proxy_pass http://host.docker.internal:8090;
proxy_redirect default;