move locale defaults to entrypoint files

diff --git a/apache/Dockerfile b/apache/Dockerfile
index 29e989b0ec1b14040ce0c880e4c21f43447688f3..2f8883bf9a81c1faa43fc4e6792679fbfab79252 100644 (file)
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -57,8 +57,6 @@ VOLUME /tmp/roundcube-temp
 # Define Roundcubemail version
 ENV ROUNDCUBEMAIL_VERSION 1.4.4
 
-ENV ROUNDCUBEMAIL_LOCALE="en_US.UTF-8 UTF-8"
-
 # Download package and extract to web volume
 RUN set -ex; \
        fetchDeps="gnupg dirmngr locales libc-l10n"; \

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

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index 5f773d247ac74d6a0fe0b6489da1fdca0e0ed787..81f436ee19a152395f87a7b893290c0d1b82061c 100644 (file)
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -55,8 +55,6 @@ VOLUME /tmp/roundcube-temp
 # Define Roundcubemail version
 ENV ROUNDCUBEMAIL_VERSION 1.4.4
 
-ENV ROUNDCUBEMAIL_LOCALE="en_US.UTF-8 UTF-8"
-
 # Download package and extract to web volume
 RUN set -ex; \
        fetchDeps="gnupg dirmngr locales libc-l10n"; \

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