summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2022-04-28 20:13:56 +0200
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2022-04-29 16:33:31 +0200
commit6efbdaa570461b2f409cd25504dbd2698f9edaf6 (patch)
treef20d12be9b7a456d35f5ec7059eecc00c83c7a52 /test
parente0ac86f7be6a0ccc01c5cf6012b248b053bd5669 (diff)
downloadgjs-6efbdaa570461b2f409cd25504dbd2698f9edaf6.tar.gz
Dockerfile: Install Turkish locale in CI for UTF-8 locale too
This is the actual recipe that has been used to generate the current image, but I forgot to update the branch that got merged earlier.
Diffstat (limited to 'test')
-rw-r--r--test/extra/Dockerfile6
-rw-r--r--test/extra/Dockerfile.debug6
2 files changed, 10 insertions, 2 deletions
diff --git a/test/extra/Dockerfile b/test/extra/Dockerfile
index ee274192..de78be30 100644
--- a/test/extra/Dockerfile
+++ b/test/extra/Dockerfile
@@ -31,6 +31,7 @@ RUN rm -f /root/mozjs-install/usr/lib64/libjs_static.ajs
FROM registry.fedoraproject.org/fedora:34
+ARG LOCALES=tr_TR
ENV SHELL=/bin/bash
# List is comprised of base dependencies for CI scripts, gjs, and debug packages
@@ -94,7 +95,10 @@ ENV HOST_USER_ID 5555
RUN useradd -u $HOST_USER_ID -G wheel -ms /bin/bash user
# Enable locales needed for specific tests
-RUN localedef --verbose --force -i tr_TR tr_TR || true
+RUN for locale in ${LOCALES}; do \
+ localedef --verbose --force -i "$locale" "$locale" || true; \
+ localedef --verbose --force -i "$locale" -f UTF-8 "$locale".UTF-8 || true; \
+ done
USER user
WORKDIR /home/user
diff --git a/test/extra/Dockerfile.debug b/test/extra/Dockerfile.debug
index 23ee8024..4548e078 100644
--- a/test/extra/Dockerfile.debug
+++ b/test/extra/Dockerfile.debug
@@ -45,6 +45,7 @@ RUN rm -f /root/mozjs-install/usr/lib64/libjs_static.ajs
FROM registry.fedoraproject.org/fedora:34
+ARG LOCALES=tr_TR
ENV SHELL=/bin/bash
# List is comprised of base dependencies for CI scripts, gjs, and debug packages
@@ -111,7 +112,10 @@ ENV HOST_USER_ID 5555
RUN useradd -u $HOST_USER_ID -G wheel -ms /bin/bash user
# Enable locales needed for specific tests
-RUN localedef --verbose --force -i tr_TR tr_TR || true
+RUN for locale in ${LOCALES}; do \
+ localedef --verbose --force -i "$locale" "$locale" || true; \
+ localedef --verbose --force -i "$locale" -f UTF-8 "$locale".UTF-8 || true; \
+ done
USER user
WORKDIR /home/user