1
0
mirror of https://github.com/zokradonh/kopano-docker.git synced 2026-08-22 13:52:56 +00:00

Add support for meet guest mode and make meet configurable through env (#105)

* get settings for meet from env
* prepare ssl container for device registration for konnect/kwmserver
* move device registry modification to konnect container
* enable WebApp in the app switcher
* upstream docker container has been updated to alpine 3.9
* update konnect
* add further config for guest mode
* replace the check for the file with a check for konnect startup
* fix kwmserver wrapper
* add possibility to change logging in kwmserver
This commit is contained in:
Felix Bartels
2019-03-18 15:22:32 +01:00
committed by GitHub
parent 4e367badc5
commit 140506df7d
7 changed files with 142 additions and 9 deletions
+9
View File
@@ -3,4 +3,13 @@ FROM kopano/kwmserverd:${CODE_VERSION}
ARG CODE_VERSION
ENV CODE_VERSION="${CODE_VERSION}"
USER root
ENV DOCKERIZE_VERSION v0.6.1
RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
COPY wrapper.sh /usr/local/bin
USER nobody
+59 -1
View File
@@ -2,14 +2,72 @@
set -e
# shellcheck disable=SC2154
if [ -n "$log_level" ]; then
set -- "$@" --log-level="$log_level"
fi
# shellcheck disable=SC2154
if [ -n "$oidc_issuer_identifier" ]; then
set -- "$@" --iss="$oidc_issuer_identifier"
fi
# shellcheck disable=SC2154
if [ "$enable_guest_api" = "yes" ]; then
set -- "$@" --enable-guest-api
fi
if [ "$INSECURE" = "yes" ]; then
set -- "$@" --insecure
fi
exec /usr/local/bin/docker-entrypoint.sh serve "$@"
# kwmserver turn
# shellcheck disable=SC2154
if [ -z "$turn_service_url" ]; then
turn_service_url=https://turnauth.kopano.com/turnserverauth/
fi
if [ -n "$turn_service_url" ]; then
set -- "$@" --turn-service-url="$turn_service_url"
fi
# shellcheck disable=SC2154
if [ -n "$turn_service_credentials" ]; then
set -- "$@" --turn-service-credentials="$$turn_service_credentials"
fi
# shellcheck disable=SC2154
if [ -n "$turn_server_shared_secret" ]; then
set -- "$@" --turn-server-shared-secret="$turn_server_shared_secret"
fi
# shellcheck disable=SC2154
if [ -n "$turn_uris" ]; then
for uri in $turn_uris; do
set -- "$@" --turn-uri="$uri"
done
fi
# kwmserver guest
# shellcheck disable=SC2154
if [ "$allow_guest_only_channels" = "yes" ]; then
set -- "$@" --allow-guest-only-channels
fi
# shellcheck disable=SC2154
if [ -n "$public_guest_access_regexp" ]; then
set -- "$@" --public-guest-access-regexp="$public_guest_access_regexp"
fi
# shellcheck disable=SC2034
export registration_conf=/kopano/ssl/konnectd-identifier-registration.yaml
# originally I wanted to wait for $registration_conf, but I needed to precreate the file
# so the konnect container (since the startup is running as nobody) can write to it.
exec dockerize \
-wait http://kopano_konnect:8777/.well-known/openid-configuration \
-timeout 360s \
/usr/local/bin/docker-entrypoint.sh serve \
--registration-conf /kopano/ssl/konnectd-identifier-registration.yaml \
"$@"