From e5a4f527028d12c976e03d92ed135ee8190f33a4 Mon Sep 17 00:00:00 2001
From: chandi <git@chandi.it>
Date: Thu, 7 Dec 2023 19:46:07 +0100
Subject: [PATCH] generate-compose: remove env variables not required in this
 step

---
 docker-compose.tmpl.yml  | 4 +---
 scripts/generate-compose | 6 ------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/docker-compose.tmpl.yml b/docker-compose.tmpl.yml
index 7fc3d7b..a4b76ad 100644
--- a/docker-compose.tmpl.yml
+++ b/docker-compose.tmpl.yml
@@ -432,9 +432,7 @@ services:
       {{else}}
       ALLOWED_DOMAINS: ${DOMAIN}
       {{end}}
-      {{ if .Env.RESOLVER_ADDRESS }}
-      RESOLVER_ADDRESS: ${RESOLVER_ADDRESS}
-      {{end}}
+      RESOLVER_ADDRESS: ${RESOLVER_ADDRESS:-9.9.9.9}
     network_mode: host
 {{end}}
 
diff --git a/scripts/generate-compose b/scripts/generate-compose
index e53103a..6348c9c 100755
--- a/scripts/generate-compose
+++ b/scripts/generate-compose
@@ -49,18 +49,12 @@ docker run  \
     -e TAG_WEBHOOKS=$(get_tag repos/bbb-webhooks) \
     -e TAG_PLAYBACK=$(get_tag repos/bbb-playback) \
     -e TAG_PADS=$(get_tag repos/bbb-pads) \
-    -e TAG_BBB_PRESENTATION_VIDEO=${TAG_BBB_PRESENTATION_VIDEO} \
-    -e TAG_GREENLIGHT=${TAG_GREENLIGHT} \
-    -e TAG_ETHERPAD=${TAG_ETHERPAD} \
     -e COMMIT_ETHERPAD_SKIN=$(get_tag repos/bbb-etherpad-skin) \
     -e COMMIT_ETHERPAD_PLUGIN=$(get_tag repos/bbb-etherpad-plugin) \
     -e DEV_MODE=${DEV_MODE:-false} \
     -e EXTERNAL_IPv6=${EXTERNAL_IPv6:-} \
     -e ENABLE_RECORDING=${ENABLE_RECORDING:-false} \
-    -e REMOVE_OLD_RECORDING=${REMOVE_OLD_RECORDING:-false} \
-    -e RECORDING_MAX_AGE_DAYS=${RECORDING_MAX_AGE_DAYS:-14} \
     -e ENABLE_HTTPS_PROXY=${ENABLE_HTTPS_PROXY:-false} \
-    -e RESOLVER_ADDRESS=${RESOLVER_ADDRESS} \
     -e ENABLE_WEBHOOKS=${ENABLE_WEBHOOKS:-false} \
     -e ENABLE_COTURN=${ENABLE_COTURN:-false} \
     -e ENABLE_GREENLIGHT=${ENABLE_GREENLIGHT:-false} \