From d1ca873b24e405fdace1805811a18afbfea1972c Mon Sep 17 00:00:00 2001 From: Rizky Maulana Nugraha Date: Wed, 27 Jan 2021 22:09:29 +0700 Subject: [PATCH] Update locale generator logic --- base_build/Dockerfile | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/base_build/Dockerfile b/base_build/Dockerfile index 3e10698..fcbb2d3 100644 --- a/base_build/Dockerfile +++ b/base_build/Dockerfile @@ -34,15 +34,20 @@ RUN chmod 0755 /gdal_install.sh;/bin/bash /gdal_install.sh # Generate all locale only on deployment mode build # Set to empty string to generate only default locale ARG GENERATE_ALL_LOCALE=1 - -COPY scripts/locale.gen /etc/locale.gen -RUN set -eux \ - && [[ (! -z "${GENERATE_ALL_LOCALE}") && (! $GENERATE_ALL_LOCALE -eq 0) ]] \ - && /usr/sbin/locale-gen - ENV LANG=en_US.UTF-8 \ LANGUAGE=en_US:en \ LC_ALL=en_US.UTF-8 + +COPY scripts/locale.gen /etc/all.locale.gen +RUN if [ -z "${GENERATE_ALL_LOCALE}" ] || [ $GENERATE_ALL_LOCALE -eq 0 ]; \ + then \ + cat /etc/all.locale.gen | grep "${LANG}" > /etc/locale.gen; \ + else \ + cp -f /etc/all.locale.gen /etc/locale.gen; \ + fi; \ + set -eux \ + && /usr/sbin/locale-gen + RUN update-locale ${LANG} # Cleanup resources