From: Brad Dutton <redacted>
Date: Wed, 3 Jun 2020 22:28:47 +0000 (-0700)
Subject: move locale defaults to entrypoint files
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=c50ce5397bada99acfb1352c40bb8e07ecf4b94e;p=roundcube-roundcubemail-docker.git

move locale defaults to entrypoint files
---

diff --git a/apache/Dockerfile b/apache/Dockerfile
index 29e989b..2f8883b 100644
--- 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 dd0fafe..7757d1e 100755
--- 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 5f773d2..81f436e 100644
--- 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 dd0fafe..7757d1e 100755
--- 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