Add container for kapps (which includes the new calendar) (#397)

* Add container for kapps (which includes the new calendar)
* remove calendar.yml

meet/Dockerfile

@@ -19,7 +19,8 @@ ENV \
     KOPANO_CORE_REPOSITORY_URL=$KOPANO_CORE_REPOSITORY_URL \
     KOPANO_CORE_VERSION=$KOPANO_CORE_VERSION \
     KOPANO_REPOSITORY_FLAGS=$KOPANO_REPOSITORY_FLAGS \
-    RELEASE_KEY_DOWNLOAD=$RELEASE_KEY_DOWNLOAD
+    RELEASE_KEY_DOWNLOAD=$RELEASE_KEY_DOWNLOAD \
+    SERVICE_TO_START=meet
 
 LABEL maintainer=az@zok.xyz \
     org.label-schema.name="Kopano Meet container" \
@@ -54,7 +55,7 @@ RUN --mount=type=secret,id=repocred,dst=/etc/apt/apt_auth.conf \
     # TODO better would be to override its configuration in kweb.cfg
     ln -s /tmp/meet.json /usr/share/kopano-kweb/www/config/kopano/meet.json
 
-COPY defaultconfigs/ start-service.sh /kopano/
+COPY start-service.sh /kopano/
 COPY goss.yaml /goss/
 CMD [ "/kopano/start-service.sh" ]
 

meet/defaultconfigs/meet.py

@@ -1,5 +0,0 @@
-import os
-import kcconf
-
-# Override configs from environment variables
-kcconf.configkopano(kcconf.parseenvironmentvariables(r"/tmp/kopano/"))

meet/start-service.sh

@@ -9,13 +9,8 @@ set -eu # unset variables are errors & non-zero return values exit the whole scr
 mkdir -p /tmp/kopano
 cp /etc/kopano/*.cfg /tmp/kopano
 
-if [ ! -e /kopano/"$SERVICE_TO_START".py ]; then
-	echo "Invalid service specified: $SERVICE_TO_START" | ts
-	exit 1
-fi
-
-echo "Configure service '$SERVICE_TO_START'" | ts
-/usr/bin/python3 /kopano/"$SERVICE_TO_START".py
+echo "Applying cfg changes from env"
+/usr/bin/python3 /kopano/cfg-from-env.py
 
 meetversion=$(dpkg-query --showformat='${Version}' --show kopano-meet-webapp)
 echo "Using Kopano Meet: $meetversion"
@@ -59,6 +54,11 @@ if [ "${GRID_WEBAPP:-yes}" = "yes" ]; then
 	jq '.apps.enabled += ["kopano-webapp"]' $CONFIG_JSON | sponge $CONFIG_JSON
 fi
 
+# enable Kopano WebApp in the app grid
+if [ "${GRID_CALENDAR:-yes}" = "yes" ]; then
+	jq '.apps.enabled += ["kopano-calendar"]' $CONFIG_JSON | sponge $CONFIG_JSON
+fi
+
 sed s/\ *=\ */=/g /tmp/kopano/kwebd.cfg > /tmp/kweb-env
 # always disable tls
 export tls=no