extern/docker
1
0
Fork 1
mirror of https://github.com/bigbluebutton/docker.git synced 2025-08-08 20:44:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

applied changes rom 2.3-alpha-8 and 2.3-beta-1

Browse Source
This commit is contained in:
chandi
2021-03-27 18:48:05 +01:00
parent 648a9b1a07
commit 96182bcc74
23 changed files with 180 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mod/nginx/Dockerfile
View File

@ -1,11 +1,6 @@
FROM node:14-alpine AS builder
RUN apk add subversion
# --------------------
ENV TAG_PlAYBACK_LEGACY v2.3-alpha-6
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_PlAYBACK_LEGACY/record-and-playback/presentation/playback/presentation /playback-legacy
RUN apk add subversion git
# --------------------
@ -16,15 +11,14 @@ ENV REACT_APP_BBB_PLAYBACK_BUILD=$TAG_PLAYBACK
# for the latest bbb-playback version shipped with 2.3-alpha-6
# so we use the master branch
# RUN svn checkout https://github.com/bigbluebutton/bbb-playback/tags/$TAG_PLAYBACK /bbb-playback
RUN svn checkout https://github.com/bigbluebutton/bbb-playback/trunk /bbb-playback
RUN git clone https://github.com/bigbluebutton/bbb-playback.git /bbb-playback && cd /bbb-playback && git checkout 4cec62c4f5332911ac035969b282a53d31374bce
RUN cd /bbb-playback && npm install && npm run-script build
# --------------------
FROM nginx:1.19-alpine
COPY --from=builder /playback-legacy/2.0 /www/presentation/2.0
COPY --from=builder /bbb-playback/build /www/presentation/2.3
COPY --from=builder /bbb-playback/build /www/playback/presentation/2.3
COPY ./bbb /etc/nginx/bbb
COPY ./bigbluebutton /etc/nginx/conf.d/default.conf
COPY ./nginx.conf /etc/nginx/nginx.conf

4
mod/nginx/bbb/bbb-html5.nginx
View File

@ -5,7 +5,9 @@ location @html5client {
proxy_set_header Connection "Upgrade";
}
rewrite ^/html5client/(fonts|compatibility|resources|svgs)/(.*) /html5client/$1/$2;
location /html5client/locales {
alias /html5-static/app/locales;
}
location /html5client/compatibility {
alias /html5-static/app/compatibility;

2
mod/nginx/bbb/notes.nginx
View File

@ -13,7 +13,7 @@ location /pad/p/ {
proxy_set_header X-Forwarded-Proto $scheme; # for EP to set secure cookie flag when https is used
proxy_http_version 1.1;
auth_request /bigbluebutton/connection/checkAuthorization;
auth_request /bigbluebutton/connection/validatePad;
auth_request_set $auth_status $upstream_status;
}

17
mod/nginx/bbb/screenshare.nginx
View File

@ -1,17 +0,0 @@
# Handle desktop sharing tunneling. Forwards
# requests to Red5 on port 5080.
location /screenshare {
proxy_pass http://core:5080;
proxy_redirect default;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
client_max_body_size 10m;
client_body_buffer_size 128k;
proxy_connect_timeout 90;
proxy_send_timeout 90;
proxy_read_timeout 90;
proxy_buffer_size 4k;
proxy_buffers 4 32k;
proxy_busy_buffers_size 64k;
proxy_temp_file_write_size 64k;
include fastcgi_params;
}

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

@ -88,6 +88,14 @@
proxy_set_header X-Original-URI $request_uri;
}
location = /bigbluebutton/connection/validatePad {
internal;
proxy_pass http://core:8090;
proxy_pass_request_body off;
proxy_set_header Content-Length "";
proxy_set_header X-Original-URI $request_uri;
}
location ~ "^/bigbluebutton\/textTrack\/(?<textTrackToken>[a-zA-Z0-9]+)\/(?<recordId>[a-zA-Z0-9_-]+)\/(?<textTrack>.+)$" {
# Workaround IE refusal to set cookies in iframe
add_header P3P 'CP="No P3P policy available"';

52
mod/nginx/bigbluebutton
View File

@ -6,14 +6,14 @@ map $remote_addr $freeswitch_addr {
upstream poolhtml5servers {
zone poolhtml5servers 32k;
least_conn;
server 10.7.7.200:4100 fail_timeout=3s fail_timeout=10s max_fails=4 backup;
server 10.7.7.201:4101 fail_timeout=2s fail_timeout=60s max_fails=2;
server 10.7.7.202:4102 fail_timeout=2s fail_timeout=60s max_fails=2;
server 10.7.7.203:4103 fail_timeout=2s fail_timeout=60s max_fails=2;
server 10.7.7.204:4104 fail_timeout=2s fail_timeout=60s max_fails=2;
server 10.7.7.205:4105 fail_timeout=2s fail_timeout=60s max_fails=2;
server 10.7.7.206:4106 fail_timeout=2s fail_timeout=60s max_fails=2;
server 10.7.7.207:4107 fail_timeout=2s fail_timeout=60s max_fails=2;
server 10.7.7.200:4100 fail_timeout=10s max_fails=4 backup;
server 10.7.7.201:4101 fail_timeout=120s max_fails=1;
server 10.7.7.202:4102 fail_timeout=120s max_fails=1;
server 10.7.7.203:4103 fail_timeout=120s max_fails=1;
server 10.7.7.204:4104 fail_timeout=120s max_fails=1;
server 10.7.7.205:4105 fail_timeout=120s max_fails=1;
server 10.7.7.206:4106 fail_timeout=120s max_fails=1;
server 10.7.7.207:4107 fail_timeout=120s max_fails=1;
}
server {
@ -28,42 +28,6 @@ server {
return 302 /b;
}
# Handle RTMPT (RTMP Tunneling). Forwards requests
# to Red5 on port 5080
location ~ (/open/|/close/|/idle/|/send/|/fcs/) {
proxy_pass http://core:5080;
proxy_redirect off;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
client_max_body_size 10m;
client_body_buffer_size 128k;
proxy_connect_timeout 90;
proxy_send_timeout 90;
proxy_read_timeout 90;
proxy_buffering off;
keepalive_requests 1000000000;
}
# Handle desktop sharing tunneling. Forwards
# requests to Red5 on port 5080.
location /deskshare {
proxy_pass http://core:5080;
proxy_redirect default;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
client_max_body_size 10m;
client_body_buffer_size 128k;
proxy_connect_timeout 90;
proxy_send_timeout 90;
proxy_read_timeout 90;
proxy_buffer_size 4k;
proxy_buffers 4 32k;
proxy_busy_buffers_size 64k;
proxy_temp_file_write_size 64k;
include fastcgi_params;
}
# Include specific rules for record and playback
include /etc/nginx/bbb/*.nginx;