From d94b7ca55d0143addebb60e1b4be4867ef1012b7 Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Mon, 27 May 2019 12:01:13 +0200 Subject: [PATCH] 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 | 7 +++++++ docker-compose.yml | 2 +- kdav/Dockerfile | 7 ++----- konnect/Dockerfile | 2 +- ldap/Dockerfile | 5 ++++- php/Dockerfile | 8 ++------ python/Dockerfile | 8 +------- zpush/Dockerfile | 5 +---- 8 files changed, 19 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index b1a0f48..22ad942 100644 --- a/Makefile +++ b/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)) diff --git a/docker-compose.yml b/docker-compose.yml index b764260..847e5fa 100644 --- a/docker-compose.yml +++ b/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: diff --git a/kdav/Dockerfile b/kdav/Dockerfile index e5f8092..e02fbf1 100644 --- a/kdav/Dockerfile +++ b/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 && \ diff --git a/konnect/Dockerfile b/konnect/Dockerfile index 5ff7e20..cc6cd09 100644 --- a/konnect/Dockerfile +++ b/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}" diff --git a/ldap/Dockerfile b/ldap/Dockerfile index add03b8..3f9f6b5 100644 --- a/ldap/Dockerfile +++ b/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 diff --git a/php/Dockerfile b/php/Dockerfile index 47be769..bd6b37d 100644 --- a/php/Dockerfile +++ b/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 && \ diff --git a/python/Dockerfile b/python/Dockerfile index 09fda83..965195e 100644 --- a/python/Dockerfile +++ b/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 \ No newline at end of file diff --git a/zpush/Dockerfile b/zpush/Dockerfile index 7598b9d..aace5f7 100644 --- a/zpush/Dockerfile +++ b/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 && \