flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-10-31 02:17:47 +00:00
Code Issues Releases Wiki Activity

Fix quoting of meet settings (#229)

Browse Source 
* add on the fly debugging to meet container
* fix quoting of settings

fixes #228
This commit is contained in:
Felix Bartels 2019-08-29 14:15:05 +02:00 committed by GitHub
parent db63ee39cb
commit 4ddb0c6da7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meet/Dockerfile
View File

@ -42,7 +42,6 @@ RUN \
echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_MEET_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \ echo "deb [${KOPANO_REPOSITORY_FLAGS}] ${KOPANO_MEET_REPOSITORY_URL} ./" > /etc/apt/sources.list.d/kopano.list; \
# install # install
apt-get update && \ apt-get update && \
set -x && \
# TODO mime-support could be remove once its an official dependency of kopano-kwebd # TODO mime-support could be remove once its an official dependency of kopano-kwebd
apt-get install --no-install-recommends -y \ apt-get install --no-install-recommends -y \
mime-support \ mime-support \
@ -51,7 +50,6 @@ RUN \
${ADDITIONAL_KOPANO_PACKAGES} \ ${ADDITIONAL_KOPANO_PACKAGES} \
&& \ && \
cp /usr/share/doc/kopano-meet-webapp/config.json.in /usr/share/kopano-kweb/www/config/kopano/meet.json && \ cp /usr/share/doc/kopano-meet-webapp/config.json.in /usr/share/kopano-kweb/www/config/kopano/meet.json && \
set +x && \
rm -rf /var/cache/apt /var/lib/apt/lists rm -rf /var/cache/apt /var/lib/apt/lists
ENV KOPANO_LOCALE="de_DE.UTF-8" ENV KOPANO_LOCALE="de_DE.UTF-8"

3
meet/start-service.sh
View File

@ -3,6 +3,7 @@
ADDITIONAL_KOPANO_PACKAGES=${ADDITIONAL_KOPANO_PACKAGES:-""} ADDITIONAL_KOPANO_PACKAGES=${ADDITIONAL_KOPANO_PACKAGES:-""}
set -eu # unset variables are errors & non-zero return values exit the whole script set -eu # unset variables are errors & non-zero return values exit the whole script
[ "$DEBUG" ] && set -x
if [ ! -e /kopano/"$SERVICE_TO_START".py ]; then if [ ! -e /kopano/"$SERVICE_TO_START".py ]; then
echo "Invalid service specified: $SERVICE_TO_START" | ts echo "Invalid service specified: $SERVICE_TO_START" | ts
@ -23,7 +24,7 @@ echo "Updating $CONFIG_JSON"
for setting in $(compgen -A variable KCCONF_MEET); do for setting in $(compgen -A variable KCCONF_MEET); do
setting2=${setting#KCCONF_MEET_} setting2=${setting#KCCONF_MEET_}
# dots in setting2 need to be escaped to not be handled as separate entities in the json file # dots in setting2 need to be escaped to not be handled as separate entities in the json file
jq ".\"${setting2//_/\".\"}\" = \"${!setting}\"" $CONFIG_JSON | sponge $CONFIG_JSON jq ".\"${setting2//_/\".\"}\" = ${!setting}" $CONFIG_JSON | sponge $CONFIG_JSON
done done
# enable Kopano WebApp in the app switcher # enable Kopano WebApp in the app switcher