mirror of
https://github.com/bigbluebutton/docker.git
synced 2025-06-24 05:51:26 +02:00
BBB v3.0 changes
This commit is contained in:
chandi
parent
f99a1632cd
commit
133ec8e29d
@ -145,8 +145,8 @@ services:
|
||||
- plugin=./repos/bbb-etherpad-plugin
|
||||
- skin=./repos/bbb-etherpad-skin
|
||||
args:
|
||||
TAG_ETHERPAD: "2.2.6"
|
||||
image: alangecker/bbb-docker-etherpad:2.2.6-s{{ .Env.COMMIT_ETHERPAD_SKIN }}-p{{ .Env.COMMIT_ETHERPAD_PLUGIN }}
|
||||
TAG_ETHERPAD: "2.2.7"
|
||||
image: alangecker/bbb-docker-etherpad:2.2.7-s{{ .Env.COMMIT_ETHERPAD_SKIN }}-p{{ .Env.COMMIT_ETHERPAD_PLUGIN }}
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- redis
|
||||
@ -178,7 +178,7 @@ services:
|
||||
context: mod/bbb-export-annotations
|
||||
additional_contexts:
|
||||
bigbluebutton: ./repos/bigbluebutton
|
||||
image: alangecker/bbb-docker-bbb-export-annotations:v2.7.0
|
||||
image: alangecker/bbb-docker-bbb-export-annotations:{{ .Env.TAG_BBB }}
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- redis
|
||||
@ -288,7 +288,8 @@ services:
|
||||
- src=./repos/bigbluebutton/bbb-graphql-server
|
||||
args:
|
||||
BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }}
|
||||
GRAPHQL_ENGINE_TAG: v2.44.0
|
||||
GRAPHQL_ENGINE_TAG: v2.45.0
|
||||
image: alangecker/bbb-docker-graphql-server:{{ .Env.TAG_BBB }}
|
||||
depends_on:
|
||||
- postgres
|
||||
- bbb-web
|
||||
@ -315,6 +316,7 @@ services:
|
||||
{{ end }}
|
||||
args:
|
||||
BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }}
|
||||
image: alangecker/bbb-docker-graphql-actions:{{ .Env.TAG_BBB }}
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- redis
|
||||
@ -339,6 +341,7 @@ services:
|
||||
{{ end }}
|
||||
args:
|
||||
BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }}
|
||||
image: alangecker/bbb-docker-graphql-middleware:{{ .Env.TAG_BBB }}
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- bbb-graphql-server
|
||||
@ -348,6 +351,8 @@ services:
|
||||
networks:
|
||||
bbb-net:
|
||||
ipv4_address: 10.7.7.32
|
||||
extra_hosts:
|
||||
- "nginx:10.7.7.1"
|
||||
|
||||
{{ if isTrue .Env.DEV_MODE }}
|
||||
user: ${BBB_DEV_UID}:${BBB_DEV_GID}
|
||||
@ -374,7 +379,7 @@ services:
|
||||
|
||||
periodic:
|
||||
build: mod/periodic
|
||||
image: alangecker/bbb-docker-periodic:v2.7.0
|
||||
image: alangecker/bbb-docker-periodic:v3.0.0
|
||||
restart: unless-stopped
|
||||
|
||||
volumes:
|
||||
@ -494,7 +499,7 @@ services:
|
||||
{{ if isTrue .Env.ENABLE_GREENLIGHT }}
|
||||
# greenlight
|
||||
greenlight:
|
||||
image: bigbluebutton/greenlight:v3.4.1
|
||||
image: bigbluebutton/greenlight:v3.5.0
|
||||
restart: unless-stopped
|
||||
env_file: .env
|
||||
depends_on:
|
||||
|
||||
@ -8,6 +8,7 @@ redis {
|
||||
services {
|
||||
bbbWebAPI="https://DOMAIN/bigbluebutton/api"
|
||||
sharedSecret="SHARED_SECRET"
|
||||
graphqlMiddlewareAPI = "http://10.7.7.32:8378"
|
||||
}
|
||||
http {
|
||||
interface = "0.0.0.0"
|
||||
|
||||
@ -6,7 +6,7 @@ redis:
|
||||
port: 6379
|
||||
password: ""
|
||||
hasura:
|
||||
url: ws://bbb-graphql-server:8085/v1/graphql
|
||||
url: ws://nginx:8185/v1/graphql
|
||||
graphql-actions:
|
||||
url: http://bbb-graphql-actions:8093
|
||||
auth_hook:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM node:18-bookworm-slim AS builder
|
||||
FROM node:22-bookworm-slim AS builder
|
||||
|
||||
COPY --from=src / /bbb-pads
|
||||
RUN cd /bbb-pads && rm -r .git && npm install --production
|
||||
@ -7,7 +7,7 @@ RUN cd /bbb-pads && rm -r .git && npm install --production
|
||||
RUN chmod 777 /bbb-pads/config
|
||||
# ------------------------------
|
||||
|
||||
FROM node:18-bookworm-slim
|
||||
FROM node:22-bookworm-slim
|
||||
|
||||
RUN apt update && apt install -y jq moreutils \
|
||||
&& useradd --uid 2003 --create-home --user-group bbb-pads
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# Build stage
|
||||
FROM golang:1.21 as builder
|
||||
FROM golang:1.23 as builder
|
||||
|
||||
ARG APP_VERSION=devel
|
||||
ARG GOMOD=github.com/bigbluebutton/bbb-webrtc-recorder
|
||||
|
||||
@ -8,10 +8,10 @@ RUN apk add git curl
|
||||
USER etherpad
|
||||
|
||||
RUN pnpm run plugins i \
|
||||
ep_cursortrace@3.1.18 \
|
||||
ep_disable_chat@0.0.10 \
|
||||
ep_auth_session@1.1.1 \
|
||||
--github \
|
||||
mconf/ep_cursortrace#56fb8c2b211cdda4fc8715ec99e1cb7b7d9eb851 \
|
||||
mconf/ep_pad_ttl#360136cd38493dd698435631f2373cbb7089082d \
|
||||
mconf/ep_redis_publisher#2b6e47c1c59362916a0b2961a29b259f2977b694
|
||||
|
||||
|
||||
@ -7,6 +7,11 @@ set -e
|
||||
|
||||
declare -p | grep -Ev '^declare -[[:alpha:]]*r' > /container.env
|
||||
|
||||
# when used with an IP, we'll also disable certbot
|
||||
if [[ "$CERT1" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
||||
IGNORE_TLS_CERT_ERRORS=true
|
||||
fi
|
||||
|
||||
if [ "$IGNORE_TLS_CERT_ERRORS" ] && [ "$IGNORE_TLS_CERT_ERRORS" != "false" ]; then
|
||||
# use self signed certificate
|
||||
if [ ! -f /etc/haproxy/certs/haproxy-10.7.7.1.pem ]; then
|
||||
|
||||
@ -16,9 +16,12 @@ RUN find /source/dist -name '*.js' -exec gzip -k -f -9 '{}' \; \
|
||||
&& find /source/dist -name '*.css' -exec gzip -k -f -9 '{}' \; \
|
||||
&& find /source/dist -name '*.wasm' -exec gzip -k -f -9 '{}' \;
|
||||
|
||||
RUN sed -i "s/VERSION/$BBB_BUILD_TAG/g" /source/dist/index.html && \
|
||||
sed -i "s/VERSION/$BBB_BUILD_TAG/g" /source/dist/stylesheets/fonts.css
|
||||
|
||||
# --------------------
|
||||
|
||||
FROM nginx:1.25-alpine
|
||||
FROM nginx:1.27-alpine
|
||||
|
||||
COPY --from=builder-learning-dashboard /bbb-learning-dashboard/build /www/learning-analytics-dashboard/
|
||||
COPY --from=builder-playback /bbb-playback/build /www/playback/presentation/2.3
|
||||
|
||||
@ -3,6 +3,11 @@ location = /html5client/locales/ {
|
||||
alias /usr/share/bigbluebutton/html5-client/locales/;
|
||||
autoindex on;
|
||||
autoindex_format json;
|
||||
|
||||
# Prevent browsers from caching
|
||||
add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
|
||||
add_header Pragma "no-cache";
|
||||
add_header Expires 0;
|
||||
}
|
||||
|
||||
# running from source (npm start)
|
||||
|
||||
@ -24,7 +24,7 @@ location /api/rest/clientSettings {
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "Upgrade";
|
||||
proxy_set_header Host $host;
|
||||
proxy_pass http://bbb-graphql-server:8085; #Hasura
|
||||
proxy_pass http://127.0.0.1:8185; #Hasura
|
||||
}
|
||||
|
||||
location /api/rest/userMetadata {
|
||||
@ -35,5 +35,5 @@ location /api/rest/userMetadata {
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "Upgrade";
|
||||
proxy_set_header Host $host;
|
||||
proxy_pass http://bbb-graphql-server:8085; #Hasura
|
||||
proxy_pass http://127.0.0.1:8185; #Hasura
|
||||
}
|
||||
|
||||
@ -159,7 +159,7 @@
|
||||
proxy_set_header X-Original-URI $request_uri;
|
||||
}
|
||||
|
||||
location /bigbluebutton/ping {
|
||||
location /bigbluebutton/rtt-check {
|
||||
default_type text/plain;
|
||||
add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
|
||||
add_header Pragma "no-cache";
|
||||
|
||||
@ -59,3 +59,28 @@ server {
|
||||
send_timeout 6h;
|
||||
}
|
||||
}
|
||||
|
||||
upstream hasura {
|
||||
least_conn;
|
||||
server bbb-graphql-server:8085;
|
||||
# you might want to add more bbb-graphql-server@ instances to balance the
|
||||
# load to multiple bbb-graphql-server instances. Execute
|
||||
# `systemctl enable --now bbb-graphql-server@8086` and uncomment the
|
||||
# following line:
|
||||
# server 127.0.0.1:8086;
|
||||
}
|
||||
server {
|
||||
listen 10.7.7.1:8185;
|
||||
listen 127.0.0.1:8185;
|
||||
|
||||
root /var/www/html;
|
||||
|
||||
location / {
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "Upgrade";
|
||||
proxy_set_header Host $host;
|
||||
|
||||
proxy_pass http://hasura;
|
||||
}
|
||||
}
|
||||
@ -38,7 +38,7 @@ ENV LANGUAGE en_US.UTF-8
|
||||
|
||||
# compile and install mkclean
|
||||
RUN cd /tmp \
|
||||
&& wget https://netcologne.dl.sourceforge.net/project/matroska/mkclean/mkclean-0.8.10.tar.bz2 \
|
||||
&& wget https://phoenixnap.dl.sourceforge.net/project/matroska/mkclean/mkclean-0.8.10.tar.bz2 \
|
||||
&& tar -xf /tmp/mkclean-0.8.10.tar.bz2 \
|
||||
&& cd /tmp/mkclean-0.8.10 \
|
||||
&& sed -i 's/\r//g' ./mkclean/configure.compiled \
|
||||
@ -54,7 +54,7 @@ RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VE
|
||||
&& rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
|
||||
|
||||
# add yq for bbb-record
|
||||
RUN wget -q https://github.com/mikefarah/yq/releases/download/3.4.1/yq_linux_amd64 -O /usr/bin/yq \
|
||||
RUN wget -q https://github.com/mikefarah/yq/releases/download/v4.45.1/yq_linux_amd64 -O /usr/bin/yq \
|
||||
&& chmod +x /usr/bin/yq
|
||||
|
||||
RUN mkdir -p \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM node:18-bookworm-slim AS builder
|
||||
FROM node:22-bookworm-slim AS builder
|
||||
|
||||
|
||||
RUN apt-get update && apt-get install -y git wget
|
||||
@ -12,7 +12,7 @@ RUN cd /bbb-webhooks && npm ci --omit=dev && rm -rf /bbb-webhooks./.git
|
||||
RUN chmod 777 /bbb-webhooks/config
|
||||
# ------------------------------
|
||||
|
||||
FROM node:18-bookworm-slim
|
||||
FROM node:22-bookworm-slim
|
||||
RUN useradd --uid 2004 --user-group bbb-webhooks
|
||||
|
||||
COPY --from=builder /usr/bin/yq /usr/bin/yq
|
||||
|
||||
@ -4,11 +4,17 @@ FROM bigbluebutton/bbb-build:$BBB_BUILD_TAG AS builder
|
||||
|
||||
RUN useradd --uid 2004 --user-group webrtc-sfu
|
||||
|
||||
# cache packages
|
||||
COPY --from=source /package.json /cache/package.json
|
||||
RUN cd /cache && npm install --unsafe-perm
|
||||
|
||||
COPY --from=source / /app
|
||||
|
||||
ENV NODE_ENV production
|
||||
|
||||
|
||||
RUN cd /app \
|
||||
&& rm -rf /app/node_modules && cp -a /cache/node_modules /app/node_modules \
|
||||
&& cp config/default.example.yml config/production.yml \
|
||||
&& npm install --unsafe-perm \
|
||||
&& npm cache clear --force \
|
||||
@ -18,7 +24,7 @@ RUN cd /app \
|
||||
|
||||
|
||||
# =============================
|
||||
FROM node:18-bookworm-slim
|
||||
FROM node:22-bookworm-slim
|
||||
RUN useradd --uid 2004 --user-group webrtc-sfu
|
||||
ENV NODE_ENV production
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 927747e0e18500f027a91bea2742e6061d388e28
|
||||
Subproject commit 88f3f6b06a1988436cb2edde5dc7e26e014e3a08
|
||||
@ -1 +1 @@
|
||||
Subproject commit 4e11f9337cecb36400f8c41caa12431b2667d8bb
|
||||
Subproject commit 4c8e3166a9c059f9b553c4038ec4db99f85834d6
|
||||
@ -1 +1 @@
|
||||
Subproject commit 6fbde34c357ba656741842048e936611faf45a09
|
||||
Subproject commit 0bda4b00a2f680b2c1264591736512ac846e7914
|
||||
@ -1 +1 @@
|
||||
Subproject commit c36e394e4aaa6be6c429222b7c9a86a8945b5563
|
||||
Subproject commit bf162e81fb427e8b2dfb9dbd1f9c120e3ac369d9
|
||||
@ -3,11 +3,12 @@
|
||||
# used to determine submodule tags without the need for
|
||||
# checking out the whole submodule
|
||||
|
||||
repos/bbb-etherpad-plugin 068ded5
|
||||
repos/bbb-etherpad-plugin 88f3f6b
|
||||
repos/bbb-etherpad-skin 8328b77
|
||||
repos/bbb-pads v1.5.3
|
||||
repos/bbb-playback v5.1.3
|
||||
repos/bbb-playback v5.2.1
|
||||
repos/bbb-webhooks v3.3.0
|
||||
repos/bbb-webrtc-sfu v2.17.0-alpha.1
|
||||
repos/bigbluebutton v3.0.0-beta.5
|
||||
repos/bbb-webrtc-recorder v0.7.0
|
||||
repos/bbb-webrtc-sfu v2.17.0-beta.4
|
||||
repos/bigbluebutton v3.0.0
|
||||
repos/freeswitch v1.10.12
|
||||
|
||||
@ -4,7 +4,7 @@ set -e
|
||||
cd $(dirname $0)/..
|
||||
|
||||
# load .env
|
||||
. functions.sh
|
||||
. scripts/functions.sh
|
||||
load_env
|
||||
|
||||
if [ ! "$ENABLE_RECORDING" == true ]; then
|
||||
|
||||
@ -16,6 +16,8 @@ function ensure_submodules {
|
||||
|
||||
}
|
||||
|
||||
# this file should exist, otherwise it is created by docker
|
||||
# with the wrong permissions
|
||||
function ensure_bbbhtml5yml {
|
||||
if [ ! -f conf/bbb-html5.yml ]; then
|
||||
|
||||
|
||||
@ -36,7 +36,7 @@ function get_tag {
|
||||
}
|
||||
|
||||
# https://hub.docker.com/r/bigbluebutton/bbb-build
|
||||
BBB_BUILD_TAG=v3.0.x-release--2024-08-30-014114
|
||||
BBB_BUILD_TAG=v3.0.x-release--2025-02-06-143818
|
||||
|
||||
docker run \
|
||||
--rm \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user