extern/docker
1
0
Fork 1
mirror of https://github.com/bigbluebutton/docker.git synced 2025-02-16 17:51:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

v2.5.0-beta.2, minor bugfixes

Browse Source
This commit is contained in:
chandi 2022-05-04 01:10:11 +02:00
parent b4aa33d20d
commit 865b39d1ce
12 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.tmpl.yml
View File

@ -244,6 +244,8 @@ services:
MS_RTP_LISTEN_IP: '{"ip":"0.0.0.0", "announcedIp":"${EXTERNAL_IPv4}"}' MS_RTP_LISTEN_IP: '{"ip":"0.0.0.0", "announcedIp":"${EXTERNAL_IPv4}"}'
volumes: volumes:
- vol-mediasoup:/var/mediasoup - vol-mediasoup:/var/mediasoup
tmpfs:
- /var/log/bbb-webrtc-sfu
network_mode: host network_mode: host
fsesl-akka: fsesl-akka:

4
mod/bbb-pads/Dockerfile
View File

@ -1,4 +1,4 @@
FROM node:14.18.3-bullseye-slim AS builder FROM node:14.19.1-bullseye-slim AS builder
COPY ./bbb-pads /bbb-pads COPY ./bbb-pads /bbb-pads
RUN cd /bbb-pads && rm -r .git && npm install --production 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 RUN chmod 777 /bbb-pads/config
# ------------------------------ # ------------------------------
FROM node:14.18.3-bullseye-slim FROM node:14.19.1-bullseye-slim
RUN apt update && apt install -y jq moreutils \ RUN apt update && apt install -y jq moreutils \
&& useradd --uid 2003 --user-group bbb-pads && useradd --uid 2003 --user-group bbb-pads

6
mod/freeswitch/Dockerfile
View File

@ -5,11 +5,7 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
subversion curl wget ca-certificates gnupg gnupg2 lsb-release unzip subversion curl wget ca-certificates gnupg gnupg2 lsb-release unzip
# install dockerize COPY --from=bbb-docker-base-java /usr/local/bin/dockerize /usr/local/bin/dockerize
ENV DOCKERIZE_VERSION v0.6.1
RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
# install freeswitch # install freeswitch

2
mod/html5/Dockerfile
View File

@ -21,7 +21,7 @@ RUN sed -i "s/VERSION/$TAG_HTML5/" /app/bundle/programs/web.browser/head.html \
# ------------------------------ # ------------------------------
FROM node:14.18.3-alpine FROM node:14.19.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 && \

1
mod/html5/bbb-html5.yml
View File

@ -1,5 +1,6 @@
public: public:
app: app:
bbbServerVersion: v2.5.0-beta.2-docker
listenOnlyMode: {{ .Env.LISTEN_ONLY_MODE }} listenOnlyMode: {{ .Env.LISTEN_ONLY_MODE }}
skipCheck: {{ .Env.DISABLE_ECHO_TEST }} skipCheck: {{ .Env.DISABLE_ECHO_TEST }}
clientTitle: {{ .Env.CLIENT_TITLE }} clientTitle: {{ .Env.CLIENT_TITLE }}

2
mod/html5/entrypoint.sh
View File

@ -11,7 +11,7 @@ export BIND_IP=0.0.0.0
export LANG=en_US.UTF-8 export LANG=en_US.UTF-8
export INSTANCE_MAX=1 export INSTANCE_MAX=1
export ENVIRONMENT_TYPE=production export ENVIRONMENT_TYPE=production
export NODE_VERSION=node-v14.18.3-linux-x64 export NODE_VERSION=node-v14.19.1-linux-x64
export BBB_HTML5_LOCAL_SETTINGS=/app/bbb-html5.yml export BBB_HTML5_LOCAL_SETTINGS=/app/bbb-html5.yml
if [ "$DEV_MODE" == true ]; then if [ "$DEV_MODE" == true ]; then

2
mod/nginx/bbb-playback

@ -1 +1 @@
Subproject commit 074a1289087a2da1744621a8374b17acea262903 Subproject commit 4031c8e5ff80c05cc6dec9b977c9df4a2cc51b35

2
mod/webrtc-sfu/Dockerfile
View File

@ -23,7 +23,7 @@ RUN cd /app \
# ============================= # =============================
FROM node:14.18.3-bullseye-slim FROM node:14.19.1-bullseye-slim
RUN useradd --uid 2004 --user-group webrtc-sfu RUN useradd --uid 2004 --user-group webrtc-sfu
ENV NODE_ENV production ENV NODE_ENV production

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

@ -1 +1 @@
Subproject commit a342bfd08d0caf66611addb292da53164a4f7fa4 Subproject commit 317495d8fac75cfff911ff7d0c044678d19b4cee

1
scripts/generate-compose
View File

@ -48,6 +48,7 @@ docker run \
-e TAG_LEARNING_DASHBOARD=${TAG_LEARNING_DASHBOARD} \ -e TAG_LEARNING_DASHBOARD=${TAG_LEARNING_DASHBOARD} \
-e TAG_RECORDINGS=${TAG_RECORDINGS} \ -e TAG_RECORDINGS=${TAG_RECORDINGS} \
-e DEV_MODE=${DEV_MODE:-false} \ -e DEV_MODE=${DEV_MODE:-false} \
-e EXTERNAL_IPv6=${EXTERNAL_IPv6:-} \
-e ENABLE_RECORDING=${ENABLE_RECORDING:-false} \ -e ENABLE_RECORDING=${ENABLE_RECORDING:-false} \
-e REMOVE_OLD_RECORDING=${REMOVE_OLD_RECORDING:-false} \ -e REMOVE_OLD_RECORDING=${REMOVE_OLD_RECORDING:-false} \
-e RECORDING_MAX_AGE_DAYS=${RECORDING_MAX_AGE_DAYS:-14} \ -e RECORDING_MAX_AGE_DAYS=${RECORDING_MAX_AGE_DAYS:-14} \

2
scripts/upgrade
View File

@ -33,7 +33,7 @@ else
docker build -t bbb-docker-base-java mod/base-java docker build -t bbb-docker-base-java mod/base-java
# rebuild everything which got modified # rebuild everything which got modified
docker-compose build --pull docker-compose build
COMMIT_HASH=$(git rev-parse --short HEAD) COMMIT_HASH=$(git rev-parse --short HEAD)
BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD) BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)

18
tags.env
View File

@ -7,16 +7,16 @@
BBB_BUILD_TAG=v2022-03-30 BBB_BUILD_TAG=v2022-03-30
# https://github.com/bigbluebutton/bigbluebutton # https://github.com/bigbluebutton/bigbluebutton
TAG_COMMON_MESSAGE=v2.5.0-beta.1 TAG_COMMON_MESSAGE=v2.5.0-beta.2
TAG_APPS_AKKA=v2.5.0-beta.1 TAG_APPS_AKKA=v2.5.0-beta.2
TAG_FSESL_AKKA=v2.5.0-beta.1 TAG_FSESL_AKKA=v2.5.0-beta.2
TAG_BBB_WEB=v2.5.0-beta.1 TAG_BBB_WEB=v2.5.0-beta.2
TAG_HTML5=v2.5.0-beta.1 TAG_HTML5=v2.5.0-beta.2
TAG_RECORDINGS=v2.5.0-beta.1 TAG_RECORDINGS=v2.5.0-beta.2
TAG_LEARNING_DASHBOARD=v2.5.0-beta.1 TAG_LEARNING_DASHBOARD=v2.5.0-beta.2
TAG_FS_CONFIG=v2.5.0-beta.1 TAG_FS_CONFIG=v2.5.0-beta.2
IMAGE_NODE=node:14.18.3-bullseye-slim IMAGE_NODE=node:14.19.1-bullseye-slim
# TODO: variable still unused # TODO: variable still unused