From 4290c1616d2199f2b8b76a95cc79da17cdd5d6f8 Mon Sep 17 00:00:00 2001
From: chandi <git@chandi.it>
Date: Sun, 7 Jan 2024 23:33:05 +0100
Subject: [PATCH] avoid duplicated BBB_BUILD_TAG values

---
 docker-compose.tmpl.yml  | 19 +++++++++----------
 scripts/generate-compose |  6 +++++-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/docker-compose.tmpl.yml b/docker-compose.tmpl.yml
index 3ec8f47..2e7b288 100644
--- a/docker-compose.tmpl.yml
+++ b/docker-compose.tmpl.yml
@@ -12,7 +12,7 @@ x-html5-backend: &html5backend
     additional_contexts:
       - source=./repos/bigbluebutton/bigbluebutton-html5
     args:
-      BBB_BUILD_TAG: bbb27-2023-06-13-java17
+      BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }}
       TAG_BBB: {{ .Env.TAG_BBB }}
   image: alangecker/bbb-docker-html5:{{ .Env.TAG_BBB }}
   restart: unless-stopped
@@ -51,7 +51,7 @@ services:
         - src-common-message=./repos/bigbluebutton/bbb-common-message
         - src-common-web=./repos/bigbluebutton/bbb-common-web
       args:
-        BBB_BUILD_TAG: bbb27-2023-06-13-java17
+        BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }}
     image: alangecker/bbb-docker-web:{{ .Env.TAG_BBB }}
     restart: unless-stopped
     depends_on:
@@ -87,7 +87,7 @@ services:
       context: mod/html5
       dockerfile: Dockerfile.dev
       args:
-        BBB_BUILD_TAG: bbb27-2023-06-13-java17
+        BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }}
     user: ${BBB_DOCKER_USER}
     restart: unless-stopped
     depends_on:
@@ -145,7 +145,7 @@ services:
         - build-files=./repos/bigbluebutton/build/packages-template/bbb-freeswitch-core/
         - fs-config=./repos/bigbluebutton/bbb-voice-conference/config/freeswitch/conf/
       args:
-        BBB_BUILD_TAG: bbb27-2023-06-13-java17
+        BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }}
     image: alangecker/bbb-docker-freeswitch:{{ .Env.TAG_FREESWITCH }}-{{ .Env.TAG_BBB }}
     restart: unless-stopped
     cap_add:
@@ -184,7 +184,7 @@ services:
         - src-learning-dashboard=./repos/bigbluebutton/bbb-learning-dashboard
         - src-playback=./repos/bbb-playback
       args:
-        BBB_BUILD_TAG: bbb27-2023-06-13-java17
+        BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }}
     image: alangecker/bbb-docker-nginx:1.23-{{ .Env.TAG_PLAYBACK }}-{{ .Env.TAG_BBB }}
     restart: unless-stopped
     depends_on:
@@ -290,13 +290,12 @@ services:
       additional_contexts:
         - source=./repos/bbb-webrtc-sfu
       args:
-        BBB_BUILD_TAG: bbb27-2023-06-13-java17
+        BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }}
     image: alangecker/bbb-docker-webrtc-sfu:{{ .Env.TAG_WEBRTC_SFU }}
     restart: unless-stopped
     depends_on:
       - redis
       - freeswitch
-      - kurento
     environment:
       CLIENT_HOST: 10.7.7.1
       REDIS_HOST: 10.7.7.5
@@ -328,7 +327,7 @@ services:
         - src-fsesl-client=./repos/bigbluebutton/bbb-fsesl-client
         - src-fsesl-akka=./repos/bigbluebutton/akka-bbb-fsesl
       args:
-        BBB_BUILD_TAG: bbb27-2023-06-13-java17
+        BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }}
     image: alangecker/bbb-docker-fsesl-akka:{{ .Env.TAG_BBB }}
     restart: unless-stopped
     depends_on:
@@ -347,7 +346,7 @@ services:
         - src-common-message=./repos/bigbluebutton/bbb-common-message
         - src-apps-akka=./repos/bigbluebutton/akka-bbb-apps
       args:
-        BBB_BUILD_TAG: bbb27-2023-06-13-java17
+        BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }}
     image: alangecker/bbb-docker-apps-akka:{{ .Env.TAG_BBB }}
     restart: unless-stopped
     depends_on:
@@ -407,7 +406,7 @@ services:
         - presentation=./repos/bigbluebutton/record-and-playback/presentation
         - bbb-conf=./repos/bigbluebutton/bigbluebutton-config
       args:
-        BBB_BUILD_TAG: bbb27-2023-06-13-java17
+        BBB_BUILD_TAG: {{ .Env.BBB_BUILD_TAG }}
         TAG_BBB_PRESENTATION_VIDEO: "4.0.3"
     image: alangecker/bbb-docker-recordings:{{ .Env.TAG_BBB }}
     restart: unless-stopped
diff --git a/scripts/generate-compose b/scripts/generate-compose
index b0ee54e..3191f60 100755
--- a/scripts/generate-compose
+++ b/scripts/generate-compose
@@ -40,6 +40,9 @@ function get_tag {
   fi
 }
 
+# https://hub.docker.com/r/bigbluebutton/bbb-build
+BBB_BUILD_TAG=v3.0.x-release--2023-09-26-152524
+
 docker run  \
     --rm  \
     -v $(pwd)/docker-compose.tmpl.yml:/docker-compose.tmpl.yml \
@@ -48,11 +51,12 @@ docker run  \
     -e TAG_WEBRTC_SFU=$(get_tag repos/bbb-webrtc-sfu) \
     -e TAG_WEBHOOKS=$(get_tag repos/bbb-webhooks) \
     -e TAG_PLAYBACK=$(get_tag repos/bbb-playback) \
+    -e TAG_WEBRTC_RECORDER=$(get_tag repos/bbb-webrtc-recorder) \
     -e TAG_PADS=$(get_tag repos/bbb-pads) \
     -e COMMIT_ETHERPAD_SKIN=$(get_tag repos/bbb-etherpad-skin) \
     -e COMMIT_ETHERPAD_PLUGIN=$(get_tag repos/bbb-etherpad-plugin) \
+    -e BBB_BUILD_TAG=${BBB_BUILD_TAG} \
     -e DEV_MODE=${DEV_MODE:-false} \
-    -e DEV_HTML5=${DEV_HTML5:-false} \
     -e EXTERNAL_IPv6=${EXTERNAL_IPv6:-} \
     -e ENABLE_RECORDING=${ENABLE_RECORDING:-false} \
     -e ENABLE_HTTPS_PROXY=${ENABLE_HTTPS_PROXY:-false} \