extern/docker
1
0
Fork 1
mirror of https://github.com/bigbluebutton/docker.git synced 2025-08-18 16:38:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into ipv6

Browse Source
This commit is contained in:
chandi
2020-07-21 17:53:48 +02:00
committed by GitHub
parent 4e97de7cb7 1ee27758ee
commit 59947e1c7a
15 changed files with 560 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/compose
View File

@@ -6,8 +6,8 @@ cd $(dirname $0)/..
# load .env
if [ -f .env ]
then
# exclude WELCOME_FOOTER because it may contain invalid characters
export $(cat .env | sed 's/#.*//g' | grep -v "WELCOME_FOOTER" | xargs)
# exclude WELCOME_MESSAGE && WELCOME_FOOTER because it may contain invalid characters
export $(cat .env | sed 's/#.*//g' | grep -v "WELCOME_FOOTER" | grep -v "WELCOME_MESSAGE" | xargs)
fi
# concatenate docker-compose file
@@ -24,4 +24,8 @@ if [ "$ENABLE_GREENLIGHT" == true ]; then
COMPOSE_FILES="$COMPOSE_FILES -f docker-compose.greenlight.yml"
fi
if [ "$ENABLE_WEBHOOKS" == true ]; then
COMPOSE_FILES="$COMPOSE_FILES -f docker-compose.webhooks.yml"
fi
docker-compose $COMPOSE_FILES $@