diff --git a/php/php73/Dockerfile b/php/php73/Dockerfile index 9034db0f..945a6f06 100644 --- a/php/php73/Dockerfile +++ b/php/php73/Dockerfile @@ -95,8 +95,18 @@ COPY --from=composer:2 /usr/bin/composer /usr/bin/composer # we need en_US locales for MSSQL connection to work # we need en_AU locales for behat to work -RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ - sed -i -e 's/# en_AU.UTF-8 UTF-8/en_AU.UTF-8 UTF-8/' /etc/locale.gen && \ +# Extra locales allow testing non-English and RTL formatting +RUN for locale in \ + en_US.UTF-8 \ + en_AU.UTF-8 \ + de_DE.UTF-8 \ + fr_FR.UTF-8 \ + es_ES.UTF-8 \ + ar_AE.UTF-8 \ + he_IL.UTF-8; \ + do \ + sed -i -e "s/# ${locale} UTF-8/${locale} UTF-8/" /etc/locale.gen; \ + done && \ dpkg-reconfigure --frontend=noninteractive locales && \ update-locale LANG=en_US.UTF-8 diff --git a/php/php74/Dockerfile b/php/php74/Dockerfile index 9f1e3246..90dfdce2 100644 --- a/php/php74/Dockerfile +++ b/php/php74/Dockerfile @@ -90,8 +90,18 @@ COPY --from=composer:2 /usr/bin/composer /usr/bin/composer # we need en_US locales for MSSQL connection to work # we need en_AU locales for behat to work -RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ - sed -i -e 's/# en_AU.UTF-8 UTF-8/en_AU.UTF-8 UTF-8/' /etc/locale.gen && \ +# Extra locales allow testing non-English and RTL formatting +RUN for locale in \ + en_US.UTF-8 \ + en_AU.UTF-8 \ + de_DE.UTF-8 \ + fr_FR.UTF-8 \ + es_ES.UTF-8 \ + ar_AE.UTF-8 \ + he_IL.UTF-8; \ + do \ + sed -i -e "s/# ${locale} UTF-8/${locale} UTF-8/" /etc/locale.gen; \ + done && \ dpkg-reconfigure --frontend=noninteractive locales && \ update-locale LANG=en_US.UTF-8 diff --git a/php/php80/Dockerfile b/php/php80/Dockerfile index c8df2598..a7f7a12f 100644 --- a/php/php80/Dockerfile +++ b/php/php80/Dockerfile @@ -90,8 +90,18 @@ COPY --from=composer:2 /usr/bin/composer /usr/bin/composer # we need en_US locales for MSSQL connection to work # we need en_AU locales for behat to work -RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ - sed -i -e 's/# en_AU.UTF-8 UTF-8/en_AU.UTF-8 UTF-8/' /etc/locale.gen && \ +# Extra locales allow testing non-English and RTL formatting +RUN for locale in \ + en_US.UTF-8 \ + en_AU.UTF-8 \ + de_DE.UTF-8 \ + fr_FR.UTF-8 \ + es_ES.UTF-8 \ + ar_AE.UTF-8 \ + he_IL.UTF-8; \ + do \ + sed -i -e "s/# ${locale} UTF-8/${locale} UTF-8/" /etc/locale.gen; \ + done && \ dpkg-reconfigure --frontend=noninteractive locales && \ update-locale LANG=en_US.UTF-8 diff --git a/php/php81/Dockerfile b/php/php81/Dockerfile index e9be8b5a..5f447bac 100644 --- a/php/php81/Dockerfile +++ b/php/php81/Dockerfile @@ -93,8 +93,18 @@ COPY --from=composer:2 /usr/bin/composer /usr/bin/composer # we need en_US locales for MSSQL connection to work # we need en_AU locales for behat to work -RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ - sed -i -e 's/# en_AU.UTF-8 UTF-8/en_AU.UTF-8 UTF-8/' /etc/locale.gen && \ +# Extra locales allow testing non-English and RTL formatting +RUN for locale in \ + en_US.UTF-8 \ + en_AU.UTF-8 \ + de_DE.UTF-8 \ + fr_FR.UTF-8 \ + es_ES.UTF-8 \ + ar_AE.UTF-8 \ + he_IL.UTF-8; \ + do \ + sed -i -e "s/# ${locale} UTF-8/${locale} UTF-8/" /etc/locale.gen; \ + done && \ dpkg-reconfigure --frontend=noninteractive locales && \ update-locale LANG=en_US.UTF-8 diff --git a/php/php82/Dockerfile b/php/php82/Dockerfile index 1f50549e..fa5c8f76 100644 --- a/php/php82/Dockerfile +++ b/php/php82/Dockerfile @@ -93,8 +93,18 @@ COPY --from=composer:2 /usr/bin/composer /usr/bin/composer # we need en_US locales for MSSQL connection to work # we need en_AU locales for behat to work -RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ - sed -i -e 's/# en_AU.UTF-8 UTF-8/en_AU.UTF-8 UTF-8/' /etc/locale.gen && \ +# Extra locales allow testing non-English and RTL formatting +RUN for locale in \ + en_US.UTF-8 \ + en_AU.UTF-8 \ + de_DE.UTF-8 \ + fr_FR.UTF-8 \ + es_ES.UTF-8 \ + ar_AE.UTF-8 \ + he_IL.UTF-8; \ + do \ + sed -i -e "s/# ${locale} UTF-8/${locale} UTF-8/" /etc/locale.gen; \ + done && \ dpkg-reconfigure --frontend=noninteractive locales && \ update-locale LANG=en_US.UTF-8 diff --git a/php/php83/Dockerfile b/php/php83/Dockerfile index fb90d4f1..04e5d276 100644 --- a/php/php83/Dockerfile +++ b/php/php83/Dockerfile @@ -93,8 +93,18 @@ COPY --from=composer:2 /usr/bin/composer /usr/bin/composer # we need en_US locales for MSSQL connection to work # we need en_AU locales for behat to work -RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ - sed -i -e 's/# en_AU.UTF-8 UTF-8/en_AU.UTF-8 UTF-8/' /etc/locale.gen && \ +# Extra locales allow testing non-English and RTL formatting +RUN for locale in \ + en_US.UTF-8 \ + en_AU.UTF-8 \ + de_DE.UTF-8 \ + fr_FR.UTF-8 \ + es_ES.UTF-8 \ + ar_AE.UTF-8 \ + he_IL.UTF-8; \ + do \ + sed -i -e "s/# ${locale} UTF-8/${locale} UTF-8/" /etc/locale.gen; \ + done && \ dpkg-reconfigure --frontend=noninteractive locales && \ update-locale LANG=en_US.UTF-8 diff --git a/php/php84/Dockerfile b/php/php84/Dockerfile index 87e27ffc..94d3f4c2 100644 --- a/php/php84/Dockerfile +++ b/php/php84/Dockerfile @@ -118,8 +118,18 @@ COPY --from=composer:2 /usr/bin/composer /usr/bin/composer # we need en_US locales for MSSQL connection to work # we need en_AU locales for behat to work -RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ - sed -i -e 's/# en_AU.UTF-8 UTF-8/en_AU.UTF-8 UTF-8/' /etc/locale.gen && \ +# Extra locales allow testing non-English and RTL formatting +RUN for locale in \ + en_US.UTF-8 \ + en_AU.UTF-8 \ + de_DE.UTF-8 \ + fr_FR.UTF-8 \ + es_ES.UTF-8 \ + ar_AE.UTF-8 \ + he_IL.UTF-8; \ + do \ + sed -i -e "s/# ${locale} UTF-8/${locale} UTF-8/" /etc/locale.gen; \ + done && \ dpkg-reconfigure --frontend=noninteractive locales && \ update-locale LANG=en_US.UTF-8 diff --git a/php/php85/Dockerfile b/php/php85/Dockerfile index f49e7366..d906816e 100644 --- a/php/php85/Dockerfile +++ b/php/php85/Dockerfile @@ -122,8 +122,18 @@ COPY --from=composer:2 /usr/bin/composer /usr/bin/composer # we need en_US locales for MSSQL connection to work # we need en_AU locales for behat to work -RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ - sed -i -e 's/# en_AU.UTF-8 UTF-8/en_AU.UTF-8 UTF-8/' /etc/locale.gen && \ +# Extra locales allow testing non-English and RTL formatting +RUN for locale in \ + en_US.UTF-8 \ + en_AU.UTF-8 \ + de_DE.UTF-8 \ + fr_FR.UTF-8 \ + es_ES.UTF-8 \ + ar_AE.UTF-8 \ + he_IL.UTF-8; \ + do \ + sed -i -e "s/# ${locale} UTF-8/${locale} UTF-8/" /etc/locale.gen; \ + done && \ dpkg-reconfigure --frontend=noninteractive locales && \ update-locale LANG=en_US.UTF-8