diff --git a/base/Dockerfile b/base/Dockerfile index b8f128b..b533080 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -46,8 +46,12 @@ RUN set -x && \ curl -s -S -o - "${KOPANO_REPOSITORY_URL}/Release.key" | apt-key add - && \ apt-get update && \ apt-get install --no-install-recommends -y \ - kopano-server-packages="${KOPANO_CORE_VERSION}" && \ - rm -rf /var/cache/apt /var/lib/apt/lists + kopano-server-packages="${KOPANO_CORE_VERSION}" \ + php7.0-cli && \ + rm -rf /var/cache/apt /var/lib/apt/lists && \ + cp /usr/share/doc/kopano/example-config/*.cfg /etc/kopano/ && \ + cp /usr/share/doc/kopano/example-config/*.cfg.gz /etc/kopano/ && \ + gzip -d -f /etc/kopano/*.gz ENV KOPANO_LOCALE="de_DE.UTF-8" ENV KOPANO_USERSCRIPT_LOCALE="de_DE.UTF-8" diff --git a/server/start.sh b/server/start.sh index 96e12d0..9f20aa6 100644 --- a/server/start.sh +++ b/server/start.sh @@ -4,8 +4,7 @@ set -eu # unset variables are errors & non-zero return values exit the whole scr mkdir -p /kopano/data/attachments /var/run/kopano -echo "Create /etc/kopano/ldap.cfg and prepare" | ts -cp /usr/share/doc/kopano/example-config/ldap.cfg /etc/kopano/ldap.cfg +echo "Create default configs and prepare" | ts sed -e "s|^\s*!include /usr/share/kopano/ldap.openldap.cfg|#!include /usr/sharekopano/ldap.openldap.cfg|" \ -e "s|#!include /usr/share/kopano/ldap.active-directory.cfg|!include /usr/share/kopano/ldap.active-directory.cfg|" \ -i /etc/kopano/ldap.cfg