From 574e9de669adcde34fafa036dc004841bbb2b1ab Mon Sep 17 00:00:00 2001 From: Felix Bartels <1257835+fbartels@users.noreply.github.com> Date: Sun, 22 Dec 2019 18:10:50 +0100 Subject: [PATCH] print version at startup (#312) * print version at startup fixes #285 --- core/start-service.sh | 7 ++++++- meet/start-service.sh | 3 +++ webapp/start.sh | 5 +++++ zpush/start.sh | 5 +++++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/core/start-service.sh b/core/start-service.sh index 4dd9428..9067874 100755 --- a/core/start-service.sh +++ b/core/start-service.sh @@ -45,6 +45,9 @@ echo "Set ownership" | ts chown kopano:kopano /kopano/data/ /kopano/data/attachments chown kapi:kopano /var/lib/kopano-grapi +coreversion=$(dpkg-query --showformat='${Version}' --show kopano-server) +echo "Using Kopano Groupware Core: $coreversion" + # allow helper commands given by "docker-compose run" if [ $# -gt 0 ]; then exec "$@" @@ -125,7 +128,6 @@ server) -timeout 360s fi # pre populate database - coreversion=$(dpkg-query --showformat='${Version}' --show kopano-server) if dpkg --compare-versions "$coreversion" "gt" "8.7.84"; then kopano-dbadm populate fi @@ -181,6 +183,7 @@ grapi) unset "${!KCCONF_@}" # the backend option is only available in more recent versions of grapi grapiversion=$(dpkg-query --showformat='${Version}' --show kopano-grapi) + echo "Using Kopano Grapi: $grapiversion" if dpkg --compare-versions "$grapiversion" "gt" "10.0.0"; then exec kopano-grapi serve --backend="$GRAPI_BACKEND" else @@ -200,6 +203,8 @@ kapi) -wait "$KCCONF_KAPID_OIDC_ISSUER_IDENTIFIER"/.well-known/openid-configuration \ -timeout 360s fi + kapiversion=$(dpkg-query --showformat='${Version}' --show kopano-kapid) + echo "Using Kopano Kapi: $kapiversion" LC_CTYPE=en_US.UTF-8 sed s/\ *=\ */=/g /etc/kopano/kapid.cfg > /tmp/kapid-env # shellcheck disable=SC2046 diff --git a/meet/start-service.sh b/meet/start-service.sh index 027bb92..cb6692f 100755 --- a/meet/start-service.sh +++ b/meet/start-service.sh @@ -13,6 +13,9 @@ fi echo "Configure service '$SERVICE_TO_START'" | ts /usr/bin/python3 /kopano/"$SERVICE_TO_START".py +meetversion=$(dpkg-query --showformat='${Version}' --show kopano-meet-webapp) +echo "Using Kopano Meet: $meetversion" + # allow helper commands given by "docker-compose run" if [ $# -gt 0 ]; then exec "$@" diff --git a/webapp/start.sh b/webapp/start.sh index 92d7c3d..1ea69bc 100755 --- a/webapp/start.sh +++ b/webapp/start.sh @@ -28,6 +28,11 @@ done # Ensure directories exist mkdir -p /run/sessions /tmp/webapp +phpversion=$(dpkg-query --showformat='${Version}' --show php7-mapi) +echo "Using PHP-Mapi: $phpversion" +webappversion=$(dpkg-query --showformat='${Version}' --show kopano-webapp) +echo "Using Kopano WebApp: $webappversion" + if [ "$KCCONF_SERVERHOSTNAME" == "127.0.0.1" ]; then echo "Kopano WebApp is using the default: connection" else diff --git a/zpush/start.sh b/zpush/start.sh index 0b9c3ef..e9fb417 100755 --- a/zpush/start.sh +++ b/zpush/start.sh @@ -53,6 +53,11 @@ done # Ensure directories mkdir -p /run/sessions +phpversion=$(dpkg-query --showformat='${Version}' --show php7-mapi) +echo "Using PHP-Mapi: $phpversion" +zpushversion=$(dpkg-query --showformat='${Version}' --show z-push-kopano) +echo "Using Z-Push: $zpushversion" + if [ "$KCCONF_SERVERHOSTNAME" == "127.0.0.1" ]; then echo "Z-Push is using the default: connection" else