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

v2.4-rc-5, debian bullseye, mongo 5.0

Browse Source
This commit is contained in:
chandi 2021-11-27 17:38:40 +01:00
parent f5cf50b2eb
commit c2aa6ad42b
16 changed files with 67 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,6 +1,10 @@
# Changelog # Changelog
## Unreleased ## Unreleased
- BigBlueButton v2.4 @alangecker [#159](https://github.com/bigbluebutton/docker/pull/159)
- Enable optimization for Prometheus Exporter when recording is enabled @omidmaldar [#161](https://github.com/bigbluebutton/docker/pull/161)
- Automatically remove old recordings after N days @omidmaldar [#162](https://github.com/bigbluebutton/docker/pull/162)
## Release v2.3.14-1 (2021-10-06) ## Release v2.3.14-1 (2021-10-06)
- Applied changes v2.3.5-v2.3.14 @alangecker - Applied changes v2.3.5-v2.3.14 @alangecker

2
docker-compose.tmpl.yml
View File

@ -160,7 +160,7 @@ services:
ipv4_address: 10.7.7.5 ipv4_address: 10.7.7.5
mongodb: mongodb:
image: mongo:4.4 image: mongo:5.0
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./mod/mongo/mongod.conf:/etc/mongod.conf - ./mod/mongo/mongod.conf:/etc/mongod.conf

6
mod/apps-akka/Dockerfile
View File

@ -3,7 +3,7 @@ FROM mozilla/sbt:8u212_1.2.8 AS builder
RUN apt-get update && apt-get install -y subversion RUN apt-get update && apt-get install -y subversion
# download bbb-common-message # download bbb-common-message
ENV TAG_COMMON_MESSAGE v2.4-rc-1 ENV TAG_COMMON_MESSAGE v2.4-rc-5
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
&& rm -rf /bbb-common-message/.svn && rm -rf /bbb-common-message/.svn
@ -14,7 +14,7 @@ RUN cd /bbb-common-message \
# =================================================== # ===================================================
ENV TAG v2.4-rc-1 ENV TAG v2.4-rc-5
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-apps /source \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-apps /source \
&& rm -rf /source/.svn && rm -rf /source/.svn
@ -25,7 +25,7 @@ RUN cd /source \
# =================================================== # ===================================================
FROM openjdk:8-jre-slim-buster FROM openjdk:8-jre-slim-bullseye
RUN apt update && apt-get install -y wget gosu RUN apt update && apt-get install -y wget gosu

16
mod/bbb-web/Dockerfile
View File

@ -3,7 +3,7 @@ FROM mozilla/sbt:8u212_1.2.8 AS builder
RUN apt-get update && apt-get install -y subversion RUN apt-get update && apt-get install -y subversion
# download bbb-common-message # download bbb-common-message
ENV TAG_COMMON_MESSAGE v2.4-rc-1 ENV TAG_COMMON_MESSAGE v2.4-rc-5
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
&& rm -rf /bbb-common-message/.svn && rm -rf /bbb-common-message/.svn
@ -26,7 +26,7 @@ RUN cd /opt \
ENV PATH="/opt/gradle-6.7/bin:${PATH}" ENV PATH="/opt/gradle-6.7/bin:${PATH}"
# download bbb-common-web # download bbb-common-web
ENV TAG_COMMON_WEB v2.4-rc-1 ENV TAG_COMMON_WEB v2.4-rc-5
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_WEB/bbb-common-web /bbb-common-web \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_WEB/bbb-common-web /bbb-common-web \
&& rm -rf /bbb-common-message/.svn && rm -rf /bbb-common-message/.svn
@ -35,7 +35,7 @@ RUN cd /bbb-common-web \
&& ./deploy.sh && ./deploy.sh
# download bbb-web # download bbb-web
ENV TAG_WEB v2.4-rc-1 ENV TAG_WEB v2.4-rc-5
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_WEB/bigbluebutton-web /bbb-web \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_WEB/bigbluebutton-web /bbb-web \
&& rm -rf /bbb-web/.svn && rm -rf /bbb-web/.svn
@ -50,7 +50,7 @@ RUN unzip -q /bbb-web/build/libs/bigbluebutton-0.10.0.war -d /dist
# =================================================== # ===================================================
FROM openjdk:8-jre-slim-buster FROM openjdk:8-jre-slim-bullseye
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
wget unzip gosu locales \ wget unzip gosu locales \
@ -77,10 +77,10 @@ RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VE
RUN mkdir -p /usr/share/bigbluebutton/blank \ RUN mkdir -p /usr/share/bigbluebutton/blank \
&& cd /usr/share/bigbluebutton/blank \ && cd /usr/share/bigbluebutton/blank \
&& wget \ && wget \
https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.4/bigbluebutton-config/slides/blank-svg.svg \ https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.4-rc-5/bigbluebutton-config/slides/blank-svg.svg \
https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.4/bigbluebutton-config/slides/blank-thumb.png \ https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.4-rc-5/bigbluebutton-config/slides/blank-thumb.png \
https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.4/bigbluebutton-config/slides/blank-presentation.pdf \ https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.4-rc-5/bigbluebutton-config/slides/blank-presentation.pdf \
https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.3.4/bigbluebutton-config/slides/blank-png.png \ https://raw.githubusercontent.com/bigbluebutton/bigbluebutton/v2.4-rc-5/bigbluebutton-config/slides/blank-png.png \
&& sed -i 's/<policy domain="coder" rights="none" pattern="PDF" \/>/<policy domain="coder" rights="write" pattern="PDF" \/>/g' /etc/ImageMagick-6/policy.xml && sed -i 's/<policy domain="coder" rights="none" pattern="PDF" \/>/<policy domain="coder" rights="write" pattern="PDF" \/>/g' /etc/ImageMagick-6/policy.xml
# get bbb-web # get bbb-web

7
mod/etherpad/Dockerfile
View File

@ -1,4 +1,5 @@
FROM etherpad/etherpad:1.8.14 FROM etherpad/etherpad:1.8.14
# TODO: update to 1.8.15 as soon as available
USER root USER root
@ -9,9 +10,11 @@ USER etherpad
# only used to trigger a fresh run of the npm install # only used to trigger a fresh run of the npm install
# command without caching # command without caching
ENV TAG v2.4-rc-1 ENV TAG v2.4-rc-5
# ep_cursortrace: using mconf's fork due to https://github.com/ether/ep_cursortrace/pull/25 not being accepted upstream
RUN npm install \ RUN npm install \
git+https://github.com/mconf/ep_cursortrace.git \
git+https://git@github.com/pedrobmarin/ep_pad_ttl.git \ git+https://git@github.com/pedrobmarin/ep_pad_ttl.git \
git+https://git@github.com/pedrobmarin/ep_redis_publisher.git \ git+https://git@github.com/pedrobmarin/ep_redis_publisher.git \
git+https://git@github.com/ether/ep_disable_chat.git \ git+https://git@github.com/ether/ep_disable_chat.git \

6
mod/freeswitch/Dockerfile
View File

@ -1,10 +1,10 @@
FROM debian:buster-slim FROM debian:bullseye-slim
# add freeswitch repo # add freeswitch repo
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends subversion curl wget ca-certificates gnupg gnupg2 lsb-release unzip && \ apt-get install -y --no-install-recommends subversion curl wget ca-certificates gnupg gnupg2 lsb-release unzip && \
curl -k https://files.freeswitch.org/repo/deb/debian-release/fsstretch-archive-keyring.asc | apt-key add - && \ wget -O /usr/share/keyrings/freeswitch-archive-keyring.gpg https://files.freeswitch.org/repo/deb/debian-release/freeswitch-archive-keyring.gpg && \
echo 'deb http://files.freeswitch.org/repo/deb/debian-release/ buster main' > /etc/apt/sources.list.d/freeswitch.list echo 'deb [signed-by=/usr/share/keyrings/freeswitch-archive-keyring.gpg] http://files.freeswitch.org/repo/deb/debian-release/ bullseye main' > /etc/apt/sources.list.d/freeswitch.list
# install dockerize # install dockerize
ENV DOCKERIZE_VERSION v0.6.1 ENV DOCKERIZE_VERSION v0.6.1

8
mod/fsesl-akka/Dockerfile
View File

@ -3,7 +3,7 @@ FROM mozilla/sbt:8u212_1.2.8 AS builder
RUN apt-get update && apt-get install -y subversion RUN apt-get update && apt-get install -y subversion
# download bbb-common-message # download bbb-common-message
ENV TAG_COMMON_MESSAGE v2.4-rc-1 ENV TAG_COMMON_MESSAGE v2.4-rc-5
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_COMMON_MESSAGE/bbb-common-message /bbb-common-message \
&& rm -rf /bbb-common-message/.svn && rm -rf /bbb-common-message/.svn
@ -13,7 +13,7 @@ RUN cd /bbb-common-message \
# =================================================== # ===================================================
ENV TAG_FSESL v2.4-rc-1 ENV TAG_FSESL v2.4-rc-5
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_FSESL/bbb-fsesl-client /bbb-fsesl-client \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_FSESL/bbb-fsesl-client /bbb-fsesl-client \
&& rm -rf /bbb-fsesl-client/.svn && rm -rf /bbb-fsesl-client/.svn
@ -21,7 +21,7 @@ RUN cd /bbb-fsesl-client \
&& ./deploy.sh && ./deploy.sh
ENV TAG v2.4-rc-1 ENV TAG v2.4-rc-5
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-fsesl /source \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/akka-bbb-fsesl /source \
&& rm -rf /source/.svn && rm -rf /source/.svn
@ -32,7 +32,7 @@ RUN unzip /source/target/universal/bbb-fsesl-akka-0.0.2.zip -d /
# # =================================================== # # ===================================================
FROM openjdk:8-jre-slim-buster FROM openjdk:8-jre-slim-bullseye
RUN apt update && apt-get install -y wget gosu RUN apt update && apt-get install -y wget gosu

15
mod/html5/Dockerfile
View File

@ -1,4 +1,4 @@
FROM node:14-buster-slim AS builder FROM node:14.18.1-bullseye-slim AS builder
RUN apt-get update && apt-get install -y wget curl subversion python3 build-essential RUN apt-get update && apt-get install -y wget curl subversion python3 build-essential
RUN groupadd -g 2000 meteor && useradd -m -u 2001 -g meteor meteor RUN groupadd -g 2000 meteor && useradd -m -u 2001 -g meteor meteor
@ -11,17 +11,16 @@ RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VE
&& rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
USER meteor USER meteor
ENV METEOR_VERSION 2.3.6 ENV METEOR_VERSION 2.5
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.4-rc-1 ENV TAG v2.4-rc-5
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 \
&& cd ~/source \ && cd ~/source \
&& ~/.meteor/meteor npm install --production \ && ~/.meteor/meteor npm ci --production \
&& npm rebuild node-sass \ && METEOR_DISABLE_OPTIMISTIC_CACHING=1 ~/.meteor/meteor build --architecture os.linux.x86_64 --directory ~/app \
&& METEOR_DISABLE_OPTIMISTIC_CACHING=1 ~/.meteor/meteor build --directory ~/app \
&& rm -rf ~/source && rm -rf ~/source
RUN cd ~/app/bundle/programs/server \ RUN cd ~/app/bundle/programs/server \
@ -29,7 +28,7 @@ RUN cd ~/app/bundle/programs/server \
# ------------------------------ # ------------------------------
FROM node:14-alpine FROM node:14.18.1-alpine
RUN addgroup -g 2000 meteor && \ RUN addgroup -g 2000 meteor && \
adduser -D -u 2001 -G meteor meteor && \ adduser -D -u 2001 -G meteor meteor && \
@ -42,4 +41,4 @@ COPY settings.yml /app/programs/server/assets/app/config/settings.yml.tmpl
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.4-rc-1 ENV TAG v2.4-rc-5

2
mod/nginx/Dockerfile
View File

@ -4,7 +4,7 @@ RUN apk add subversion git
# -------------------- # --------------------
ENV TAG_LEARNING_DASHBOARD v2.4-rc-1 ENV TAG_LEARNING_DASHBOARD v2.4-rc-5
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_LEARNING_DASHBOARD/bbb-learning-dashboard /bbb-learning-dashboard && rm -r /bbb-learning-dashboard/.svn RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG_LEARNING_DASHBOARD/bbb-learning-dashboard /bbb-learning-dashboard && rm -r /bbb-learning-dashboard/.svn
RUN cd /bbb-learning-dashboard && npm ci && npm run build RUN cd /bbb-learning-dashboard && npm ci && npm run build

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

@ -25,6 +25,14 @@ location /html5client/fonts {
alias /html5-static/app/fonts; alias /html5-static/app/fonts;
} }
location /html5client/wasm {
types {
application/wasm wasm;
}
gzip_static on;
alias /html5-static/app/wasm;
}
location /html5client/ { location /html5client/ {
alias /html5-static; alias /html5-static;
try_files $uri @html5client; try_files $uri @html5client;

4
mod/nginx/bbb/notes-playback.nginx Normal file
View File

@ -0,0 +1,4 @@
location /notes {
root /var/bigbluebutton/published;
index index.html index.htm;
}

2
mod/periodic/Dockerfile
View File

@ -1,4 +1,4 @@
FROM debian:buster-slim FROM debian:bullseye-slim
# -- install mongo cli # -- install mongo cli
RUN apt-get update \ RUN apt-get update \

2
mod/recordings/Dockerfile
View File

@ -45,7 +45,7 @@ RUN mkdir -p \
/usr/local/bigbluebutton/core \ /usr/local/bigbluebutton/core \
/etc/bigbluebutton /etc/bigbluebutton
ENV TAG v2.4-rc-1 ENV TAG v2.4-rc-5
# 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 \

2
mod/webhooks/Dockerfile
View File

@ -13,7 +13,7 @@ RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VE
USER webhooks USER webhooks
ENV TAG v2.4-rc-1 ENV TAG v2.4-rc-5
RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bbb-webhooks /app \ RUN svn checkout https://github.com/bigbluebutton/bigbluebutton/tags/$TAG/bbb-webhooks /app \
&& rm -rf /app/.svn \ && rm -rf /app/.svn \
&& cd /app && npm install --production && cd /app && npm install --production

20
mod/webrtc-sfu/Dockerfile
View File

@ -1,7 +1,15 @@
FROM node:14-alpine FROM node:14-bullseye-slim
RUN apk add git \
&& adduser -D -u 2004 -g webrtc-sfu webrtc-sfu RUN apt-get update && apt-get -y install \
git \
make \
python \
python3-pip \
g++ \
ffmpeg
RUN useradd --uid 2004 --user-group webrtc-sfu
ADD ./bbb-webrtc-sfu app ADD ./bbb-webrtc-sfu app
@ -17,8 +25,10 @@ RUN cp config/default.example.yml config/production.yml \
&& chown -R webrtc-sfu:webrtc-sfu config \ && chown -R webrtc-sfu:webrtc-sfu config \
&& rm .git \ && rm .git \
&& npm install --unsafe-perm \ && npm install --unsafe-perm \
&& npm cache clear --force && npm cache clear --force \
&& rm -rf node_modules/mediasoup/worker/out/Release/subprojects \
&& rm -rf node_modules/mediasoup/worker/out/Release/mediasoup-worker.p \
&& rm -rf node_modules/mediasoup/worker/out/Release/deps
COPY docker-entrypoint.sh /app/docker-entrypoint.sh COPY docker-entrypoint.sh /app/docker-entrypoint.sh
USER webrtc-sfu USER webrtc-sfu

2
mod/webrtc-sfu/bbb-webrtc-sfu

@ -1 +1 @@
Subproject commit e7c88d652e9af13cbc668c924a4a0ce867f907fb Subproject commit c33878c89e5f4486ca980086e814491ece436e1c