diff --git a/php/php73/Dockerfile b/php/php73/Dockerfile index 7ba2c396..334198f0 100644 --- a/php/php73/Dockerfile +++ b/php/php73/Dockerfile @@ -88,8 +88,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 0b3bfe1c..be78e15b 100644 --- a/php/php74/Dockerfile +++ b/php/php74/Dockerfile @@ -83,8 +83,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 e70a6df4..2f6ae7b7 100644 --- a/php/php80/Dockerfile +++ b/php/php80/Dockerfile @@ -83,8 +83,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 8992c73b..61edb426 100644 --- a/php/php81/Dockerfile +++ b/php/php81/Dockerfile @@ -89,8 +89,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 e19d0d51..259107af 100644 --- a/php/php82/Dockerfile +++ b/php/php82/Dockerfile @@ -89,8 +89,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 3942bcf8..5a501059 100644 --- a/php/php83/Dockerfile +++ b/php/php83/Dockerfile @@ -89,8 +89,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 7b8a0230..fd864abe 100644 --- a/php/php84/Dockerfile +++ b/php/php84/Dockerfile @@ -110,8 +110,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 b02961c7..a6a59afb 100644 --- a/php/php85/Dockerfile +++ b/php/php85/Dockerfile @@ -114,8 +114,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