Update Dockerfile so that is works also for debian 9

Update assets/kopano-webaddr.sh now that we do not have builds for debian 8

Dockerfile

@@ -40,7 +40,7 @@ FROM	base AS base-man
 # Reinstall all currently installed packages in order to get the man pages back
 #
 ENV	DEBIAN_FRONTEND=noninteractive
-RUN	rm /etc/dpkg/dpkg.cfg.d/excludes \
+RUN	rm -f /etc/dpkg/dpkg.cfg.d/excludes \
 	&& apt-get update \
 	&& dpkg -l | grep ^ii | cut -d' ' -f3 | xargs apt-get install -y --reinstall \
 	&& apt-get install --yes --no-install-recommends \
@@ -132,7 +132,7 @@ ENV	DEBIAN_FRONTEND=noninteractive \
 #
 # Install Kopano webapp
 #
-RUN	apt-get install --yes --no-install-recommends apache2 libapache2-mod-php7.2 \
+RUN	apt-get install --yes --no-install-recommends apache2 libapache2-mod-php \
 	&& mkdir -p $docker_build_deb_dir \
 	&& webaddr=$(kopano-webaddr.sh webapp \
 	https://download.kopano.io/community ${DIST} ${REL} all) \

Makefile

@@ -7,7 +7,7 @@ IMG_CMD  ?= /bin/bash
 
 CNT_NAME ?= kopano-default
 CNT_PORT ?= -p 80:80
-CNT_ENV  ?= 
+CNT_ENV  ?=
 CNT_VOL  ?=
 
 .PHONY: build build-all bulid-core build-full build-debugtools \
@@ -70,3 +70,7 @@ rm-image:
 
 release: build
 	make push -e IMG_VER=$(IMG_VER)
+
+build-show-version:
+	# core-webapp
+	assets/kopano-webaddr.sh -VV

assets/kopano-webaddr.sh

@@ -9,7 +9,7 @@ _debroot="http://repo.z-hub.io/z-push:"
 _component="core"
 _stage="final"
 _dist="debian"
-_rel="8"
+_rel="9"
 _arch="amd64"
 
 #
@@ -36,8 +36,8 @@ webaddr_kopano() {
 debaddr_zpush() {
 	local stage="${1-$_stage}"
 	local debroot="${2-$_debroot}"
-        local dist=$(captialize "${3-$_dist}")
-        local rel=$(decimalise "${4-$_rel}")
+	local dist=$(captialize "${3-$_dist}")
+	local rel=$(decimalise "${4-$_rel}")
 	echo "$debroot/$stage/${dist}_${rel}"
 }