diff --git a/docker-compose.tmpl.yml b/docker-compose.tmpl.yml index f7f0a5f..03aadcc 100644 --- a/docker-compose.tmpl.yml +++ b/docker-compose.tmpl.yml @@ -175,7 +175,7 @@ services: ipv4_address: 10.7.7.18 redis: - image: redis:7.0-rc-alpine + image: redis:7.0-alpine restart: unless-stopped healthcheck: test: ["CMD", "redis-cli", "ping"] @@ -230,7 +230,7 @@ services: # TODO: add mediasoup IPv6 # TODO: can listen to 0.0.0.0 for nat support? https://github.com/versatica/mediasoup/issues/487 {{ if .Env.EXTERNAL_IPv6 }} - MS_WEBRTC_LISTEN_IPS: '[{"ip":"${EXTERNAL_IPv6}", "announcedIp":"${EXTERNAL_IPv6}"}, {"ip":"${EXTERNAL_IPv4}", "announcedIp":"${EXTERNAL_IPv4}"}]' + MS_WEBRTC_LISTEN_IPS: '[{"ip":"{{ .Env.EXTERNAL_IPv6 }}", "announcedIp":"{{ .Env.EXTERNAL_IPv6 }}"}, {"ip":"${EXTERNAL_IPv4}", "announcedIp":"${EXTERNAL_IPv4}"}]' {{else}} MS_WEBRTC_LISTEN_IPS: '[{"ip":"${EXTERNAL_IPv4}", "announcedIp":"${EXTERNAL_IPv4}"}]' {{end}} @@ -436,7 +436,7 @@ services: {{ if isTrue .Env.ENABLE_PROMETHEUS_EXPORTER }} # prometheus prometheus-exporter: - image: greenstatic/bigbluebutton-exporter:v0.7.0-preview2 + image: greenstatic/bigbluebutton-exporter:latest restart: unless-stopped environment: API_BASE_URL: http://10.7.7.1:48087/bigbluebutton/api/ diff --git a/mod/etherpad/Dockerfile b/mod/etherpad/Dockerfile index 9462f8e..c9f7ddd 100644 --- a/mod/etherpad/Dockerfile +++ b/mod/etherpad/Dockerfile @@ -1,4 +1,4 @@ -FROM etherpad/etherpad:1.8.17 +FROM etherpad/etherpad:1.8.18 USER root diff --git a/mod/webhooks/Dockerfile b/mod/webhooks/Dockerfile index 48b0e36..088e2b9 100644 --- a/mod/webhooks/Dockerfile +++ b/mod/webhooks/Dockerfile @@ -3,7 +3,7 @@ FROM node:14.18.3-bullseye-slim AS builder RUN apt-get update && apt-get install -y git wget -RUN wget -q https://github.com/mikefarah/yq/releases/download/v4.20.1/yq_linux_amd64 -O /usr/bin/yq \ +RUN wget -q https://github.com/mikefarah/yq/releases/download/v4.25.1/yq_linux_amd64 -O /usr/bin/yq \ && chmod +x /usr/bin/yq COPY ./bbb-webhooks /bbb-webhooks diff --git a/scripts/checkout-submodules b/scripts/checkout-submodules new file mode 100755 index 0000000..6724ea0 --- /dev/null +++ b/scripts/checkout-submodules @@ -0,0 +1,27 @@ +#!/bin/bash + +# checkouts submodules based on the tag +# provided in `tags.env` + + +set -e +cd "$(dirname "$0")/.." + +export $(cat tags.env | sed 's/#.*//g' | xargs) + +function checkout { + path=$1 + ref=$2 + pushd $path + git checkout $ref + popd > /dev/null +} + +checkout mod/webrtc-sfu/bbb-webrtc-sfu $TAG_WEBRTC_SFU +checkout mod/nginx/bbb-playback $TAG_PLAYBACK +checkout mod/bbb-pads/bbb-pads $TAG_PADS +checkout mod/webhooks/bbb-webhooks $TAG_WEBHOOKS + +echo "" +echo "# git submodule" +git submodule \ No newline at end of file diff --git a/tags.env b/tags.env index 502017d..d094962 100644 --- a/tags.env +++ b/tags.env @@ -7,16 +7,21 @@ BBB_BUILD_TAG=v2022-03-30 # https://github.com/bigbluebutton/bigbluebutton -TAG_COMMON_MESSAGE=v2.5.0-beta.2 -TAG_APPS_AKKA=v2.5.0-beta.2 -TAG_FSESL_AKKA=v2.5.0-beta.2 -TAG_BBB_WEB=v2.5.0-beta.2 -TAG_HTML5=v2.5.0-beta.2 -TAG_RECORDINGS=v2.5.0-beta.2 +TAG_COMMON_MESSAGE=v2.5.0-rc.1 +TAG_APPS_AKKA=v2.5.0-rc.1 +TAG_FSESL_AKKA=v2.5.0-rc.1 +TAG_BBB_WEB=v2.5.0-rc.1 +TAG_HTML5=v2.5.0-rc.1 +TAG_RECORDINGS=v2.5.0-rc.1 -TAG_LEARNING_DASHBOARD=v2.5.0-beta.2 -TAG_FS_CONFIG=v2.5.0-beta.2 +TAG_LEARNING_DASHBOARD=v2.5.0-rc.1 +TAG_FS_CONFIG=v2.5.0-rc.1 -IMAGE_NODE=node:14.19.1-bullseye-slim -# TODO: variable still unused \ No newline at end of file +# individual git submodules +# use `./scripts/checkout-submodules` to ensure, that the submodules +# match the provided tags here +TAG_WEBRTC_SFU=v2.8.1 +TAG_WEBHOOKS=v2.5.0 +TAG_PLAYBACK=v4.0.0 +TAG_PADS=v1.1.0 \ No newline at end of file