remove surplus locale definition from images building upon base (#165)

* remove surplus locale configuration (should only be in base image)
update konnect
add version to ldap and ldap_demo images
* also create a tag for the ldap images
* add ldap version to compose file

Makefile

@@ -189,6 +189,13 @@ tag-kwmserver:
 	$(shell docker run --rm $(docker_repo)/kopano_kwmserver env | grep CODE_VERSION | cut -d'=' -f2))
 	component=kwmserver make tag-container
 
+tag-ldap:
+	$(eval ldap_version := \
+	$(shell docker run --rm $(docker_repo)/kopano_ldap env | grep CODE_VERSION | cut -d'=' -f2))
+	component=ldap make tag-container
+	$(eval ldap_demo_version := $(ldap_version))
+	component=ldap_demo make tag-container
+
 tag-meet:
 	$(eval meet_version := \
 	$(shell docker run --rm $(docker_repo)/kopano_meet cat /kopano/buildversion | grep meet | cut -d- -f2 | cut -d+ -f1))

docker-compose.yml

@@ -27,7 +27,7 @@ services:
          - ${FQDNCLEANED?err}
 
   ldap:
-    image: ${docker_repo:-zokradonh}/${LDAP_CONTAINER:-kopano_ldap_demo}
+    image: ${docker_repo:-zokradonh}/${LDAP_CONTAINER:-kopano_ldap_demo}:${LDAP_VERSION:-latest}
     restart: unless-stopped
     container_name: ${COMPOSE_PROJECT_NAME}_ldap
     ports:

kdav/Dockerfile

@@ -1,5 +1,5 @@
 ARG docker_repo=zokradonh
-FROM composer:1.8.4 as builder
+FROM composer:1.8 as builder
 
 RUN git clone --depth 1 https://stash.kopano.io/scm/kc/kdav.git /usr/share/kdav
 WORKDIR /usr/share/kdav
@@ -46,10 +46,7 @@ RUN \
 COPY apache2-kopano-kdav.conf /etc/apache2/sites-available/kopano-kdav.conf
 
 # configure basics
-RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
-    sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen && \
-    dpkg-reconfigure --frontend=noninteractive locales && \
-    update-locale LANG=en_US.UTF-8 && \
+RUN \
     # configure apache
     rm /etc/apache2/sites-enabled/* && \
     sed -e 's,^ErrorLog.*,ErrorLog "|/bin/cat",' -i /etc/apache2/apache2.conf && \

konnect/Dockerfile

@@ -1,4 +1,4 @@
-ARG CODE_VERSION=0.23.3
+ARG CODE_VERSION=0.23.4
 FROM kopano/konnectd:${CODE_VERSION}
 ARG CODE_VERSION
 ENV CODE_VERSION="${CODE_VERSION}"

ldap/Dockerfile

@@ -1,4 +1,7 @@
-FROM osixia/openldap:1.2.4
+ARG CODE_VERSION=1.2.4
+FROM osixia/openldap:${CODE_VERSION}
+ARG CODE_VERSION
+ENV CODE_VERSION="${CODE_VERSION}"
 
 COPY bootstrap /container/service/slapd/assets/config/bootstrap
 RUN rm /container/service/slapd/assets/config/bootstrap/schema/mmc/mail.schema

php/Dockerfile

@@ -43,12 +43,8 @@ RUN \
         ${ADDITIONAL_KOPANO_PACKAGES} \
     && rm -rf /var/cache/apt /var/lib/apt/lists
 
-# configure basics
-RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
-    sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen && \
-    dpkg-reconfigure --frontend=noninteractive locales && \
-    update-locale LANG=en_US.UTF-8 && \
-    # configure php-fpm
+# configure php-fpm
+RUN \
     mkdir -p /run/php && chown www-data:www-data /run/php && \
     crudini --set /etc/php/7.0/fpm/php.ini PHP upload_max_filesize 500M && \
     crudini --set /etc/php/7.0/fpm/php.ini PHP post_max_size 500M && \

python/Dockerfile

@@ -38,10 +38,4 @@ RUN \
     apt-get update && apt-get install -y --no-install-recommends \
         python3-kopano \
         ${ADDITIONAL_KOPANO_PACKAGES} \
-    && rm -rf /var/cache/apt /var/lib/apt/lists
-
-# configure basics
-RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
-    sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen && \
-    dpkg-reconfigure --frontend=noninteractive locales && \
-    update-locale LANG=en_US.UTF-8
+    && rm -rf /var/cache/apt /var/lib/apt/lists

zpush/Dockerfile

@@ -55,10 +55,7 @@ RUN \
 COPY apache2-kopano.conf /etc/apache2/sites-available/kopano.conf
 
 # configure basics
-RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
-    sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen && \
-    dpkg-reconfigure --frontend=noninteractive locales && \
-    update-locale LANG=en_US.UTF-8 && \
+RUN \
     # configure apache
     rm /etc/apache2/sites-enabled/* && \
     sed -e 's,^ErrorLog.*,ErrorLog "|/bin/cat",' -i /etc/apache2/apache2.conf && \