add support for locales in the Debian images

diff --git a/apache/Dockerfile b/apache/Dockerfile
index 6e2305bed45da87050bb1e75a262e9faba763f38..2f8883bf9a81c1faa43fc4e6792679fbfab79252 100644 (file)
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -59,7 +59,7 @@ ENV ROUNDCUBEMAIL_VERSION 1.4.4
 
 # Download package and extract to web volume
 RUN set -ex; \
-       fetchDeps="gnupg dirmngr"; \
+       fetchDeps="gnupg dirmngr locales libc-l10n"; \
        apt-get -qq update; \
        apt-get install -y --no-install-recommends $fetchDeps; \
        curl -o roundcubemail.tar.gz -fSL https://github.com/roundcube/roundcubemail/releases/download/${ROUNDCUBEMAIL_VERSION}/roundcubemail-${ROUNDCUBEMAIL_VERSION}-complete.tar.gz; \

diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh
index 733453eaf549f5c52b4be0603604f5115de8269b..dd0fafe40d5cc71b4edc849f27c5942ebc5c7d60 100755 (executable)
--- a/apache/docker-entrypoint.sh
+++ b/apache/docker-entrypoint.sh
@@ -104,6 +104,11 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
     echo "upload_max_filesize=${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" >> /usr/local/etc/php/conf.d/roundcube-override.ini
     echo "post_max_size=${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" >> /usr/local/etc/php/conf.d/roundcube-override.ini
   fi
+
+  if [ ! -z "${ROUNDCUBEMAIL_LOCALE}" ]; then
+    echo "${ROUNDCUBEMAIL_LOCALE}" > /etc/locale.gen
+    /usr/sbin/locale-gen
+  fi
 fi
 
 exec "$@"

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index 12fe785e394fd91b6c769cc671611814bfad828c..81f436ee19a152395f87a7b893290c0d1b82061c 100644 (file)
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -57,7 +57,7 @@ ENV ROUNDCUBEMAIL_VERSION 1.4.4
 
 # Download package and extract to web volume
 RUN set -ex; \
-       fetchDeps="gnupg dirmngr"; \
+       fetchDeps="gnupg dirmngr locales libc-l10n"; \
        apt-get -qq update; \
        apt-get install -y --no-install-recommends $fetchDeps; \
        curl -o roundcubemail.tar.gz -fSL https://github.com/roundcube/roundcubemail/releases/download/${ROUNDCUBEMAIL_VERSION}/roundcubemail-${ROUNDCUBEMAIL_VERSION}-complete.tar.gz; \

diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh
index 733453eaf549f5c52b4be0603604f5115de8269b..dd0fafe40d5cc71b4edc849f27c5942ebc5c7d60 100755 (executable)
--- a/fpm/docker-entrypoint.sh
+++ b/fpm/docker-entrypoint.sh
@@ -104,6 +104,11 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
     echo "upload_max_filesize=${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" >> /usr/local/etc/php/conf.d/roundcube-override.ini
     echo "post_max_size=${ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE}" >> /usr/local/etc/php/conf.d/roundcube-override.ini
   fi
+
+  if [ ! -z "${ROUNDCUBEMAIL_LOCALE}" ]; then
+    echo "${ROUNDCUBEMAIL_LOCALE}" > /etc/locale.gen
+    /usr/sbin/locale-gen
+  fi
 fi
 
 exec "$@"