From 864459d7455da9d4169f1da014f7bc532601b144 Mon Sep 17 00:00:00 2001 From: Felix Bartels <1257835+fbartels@users.noreply.github.com> Date: Wed, 25 Mar 2020 14:39:11 +0100 Subject: [PATCH] Make it possible to specify a turn service secret as a text env (#370) * update kwmserver to 1.1.1 * add scripting to create turn_server_shared_secret as a file * make startup of kwmserver verbose when DEBUG env is set --- kwmserver/Dockerfile | 2 +- kwmserver/wrapper.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/kwmserver/Dockerfile b/kwmserver/Dockerfile index e0e8d30..806877a 100644 --- a/kwmserver/Dockerfile +++ b/kwmserver/Dockerfile @@ -1,4 +1,4 @@ -ARG CODE_VERSION=1.1.0 +ARG CODE_VERSION=1.1.1 FROM kopano/kwmserverd:${CODE_VERSION} ARG VCS_REF diff --git a/kwmserver/wrapper.sh b/kwmserver/wrapper.sh index 20e58f3..f9a709e 100755 --- a/kwmserver/wrapper.sh +++ b/kwmserver/wrapper.sh @@ -1,6 +1,7 @@ #!/bin/sh set -e +[ "$DEBUG" ] && set -x if [ -n "${log_level:-}" ]; then set -- "$@" --log-level="$log_level" @@ -37,6 +38,11 @@ if [ -n "${turn_service_credentials:-}" ]; then fi if [ -n "${turn_server_shared_secret:-}" ]; then + if [ ! -f "$turn_server_shared_secret" ]; then + turn_server_shared_secret_file=/tmp/turn_server_shared_secret_file + echo "$turn_server_shared_secret" > "$turn_server_shared_secret_file" + turn_server_shared_secret="$turn_server_shared_secret_file" + fi set -- "$@" --turn-server-shared-secret="$turn_server_shared_secret" fi