Update kweb (#209)

* Update kweb to latest release
the fqdn needs to be part of kweb.cfg
make port 2015 explicit
fixes #208

* testing improvements
add git to build container
improve ci testing
add kopano-ical ports to setup


* no longer run kweb as root
now possible because of https://stash.kopano.io/projects/KGOL/repos/kweb/commits/fd5c7307db6ebfb8e326edfa98114be7c062f77d
may require to manually delete the kopano_web data volume since kweb user cannot read data from root user.

web/Dockerfile

@@ -1,4 +1,4 @@
-ARG CODE_VERSION=0.6.1
+ARG CODE_VERSION=0.7.0
 FROM kopano/kwebd:${CODE_VERSION}
 
 ARG VCS_REF
@@ -6,6 +6,9 @@ ARG CODE_VERSION
 
 ENV CODE_VERSION="${CODE_VERSION}"
 
+COPY wrapper.sh /usr/local/bin
+COPY kweb.cfg /etc/kweb.cfg
+
 LABEL maintainer=az@zok.xyz \
     org.label-schema.name="Kopano Web container" \
     org.label-schema.description="Reverse proxy for http(s) based components of kopano-docker" \
@@ -14,11 +17,3 @@ LABEL maintainer=az@zok.xyz \
     org.label-schema.vcs-url="https://github.com/zokradonh/kopano-docker" \
     org.label-schema.version=$CODE_VERSION \
     org.label-schema.schema-version="1.0"
-
-ENV KWEBD_USER root
-ENV KWEBD_GROUP root
-# hadolint ignore=DL3002
-USER root
-COPY wrapper.sh /usr/local/bin
-COPY kweb.cfg /etc/kweb.cfg
-

web/kweb.cfg

@@ -1,8 +1,9 @@
-:80 {
+{%FQDN%}:80, :80 {
     redir / https://{host}{uri}
 }
 
-*, :443 {
+# kweb >=0.7.0 needs the explicit hostname to be set
+{%FQDN%}, *:2015, *:443 {
     log stdout
     errors stdout
 

web/wrapper.sh

@@ -2,9 +2,4 @@
 
 set -e
 
-if [ "$EMAIL" = "self_signed" ] || [ "$EMAIL" = "off" ]; then
-	# do not use the '-host' option if using a self signed cert
-	exec kwebd caddy -conf /etc/kweb.cfg -agree
-else
-	exec kwebd caddy -conf /etc/kweb.cfg -agree -host "$FQDN"
-fi
+exec kwebd caddy -conf /etc/kweb.cfg -agree