bootstrap: force use of LANGUAGE=en_US

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 279c10877895e2cba98f5c42ec1662f01052f42c..d5390c8821da91f88608ade0dafca7a0e1c72128 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 6f4e1c3f1eb3b3236ae793c11def2135386a0ee9
+  SAMBA_CI_CONTAINER_TAG: 0b8b0640b6475650c8db301236c03c9ad732f52e
   #
   # We use the ubuntu2204 image as default as
   # it matches what we have on atb-devel-224

diff --git a/bootstrap/config.py b/bootstrap/config.py
index c67ab9184abae0cead6e41efb2697d4a8d1635f9..f61e52a7aea241abd907d2e29866657bad1fa200 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -389,7 +389,7 @@ RUN useradd -m -U -s /bin/bash samba && \
 USER samba
 WORKDIR /home/samba
 # samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
 """
 
 # Vagrantfile snippet for each dist

diff --git a/bootstrap/generated-dists/centos7/Dockerfile b/bootstrap/generated-dists/centos7/Dockerfile
index ccb4654110674d501c535321a5503b6037c7b41b..a11c4dbf169f800b6aad4792b496b3c753d27b38 100644 (file)
--- a/bootstrap/generated-dists/centos7/Dockerfile
+++ b/bootstrap/generated-dists/centos7/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
 USER samba
 WORKDIR /home/samba
 # samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file

diff --git a/bootstrap/generated-dists/centos8s/Dockerfile b/bootstrap/generated-dists/centos8s/Dockerfile
index 6f8a883b075b885a72b9b1e830f434a404317369..3b5a681118f83df02ffcab05784347a3f453e26b 100644 (file)
--- a/bootstrap/generated-dists/centos8s/Dockerfile
+++ b/bootstrap/generated-dists/centos8s/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
 USER samba
 WORKDIR /home/samba
 # samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file

diff --git a/bootstrap/generated-dists/debian11/Dockerfile b/bootstrap/generated-dists/debian11/Dockerfile
index b7a46ca53e5cd984b046c55a28caffd7cc692da8..90a961f5345725cea6573b614fa04edc26c9f85c 100644 (file)
--- a/bootstrap/generated-dists/debian11/Dockerfile
+++ b/bootstrap/generated-dists/debian11/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
 USER samba
 WORKDIR /home/samba
 # samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file

diff --git a/bootstrap/generated-dists/fedora38/Dockerfile b/bootstrap/generated-dists/fedora38/Dockerfile
index 10002774e20df4ee98af3e17afb1ceedf1283049..56426229c2b7add6101f1a3bc6341148638737c6 100644 (file)
--- a/bootstrap/generated-dists/fedora38/Dockerfile
+++ b/bootstrap/generated-dists/fedora38/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
 USER samba
 WORKDIR /home/samba
 # samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file

diff --git a/bootstrap/generated-dists/opensuse154/Dockerfile b/bootstrap/generated-dists/opensuse154/Dockerfile
index a6bdd6cb328ea2cd34613b9b14fb4e36faa30b1f..621a3656389995b3b9f274d289c38fc67a0b6d3e 100644 (file)
--- a/bootstrap/generated-dists/opensuse154/Dockerfile
+++ b/bootstrap/generated-dists/opensuse154/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
 USER samba
 WORKDIR /home/samba
 # samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file

diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/Dockerfile b/bootstrap/generated-dists/ubuntu1804-32bit/Dockerfile
index 3d0c21c1434a29f28716bfad56ba1839d7125198..4feffbd3d8fd66f15cafc40f244b81f1e23737d5 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804-32bit/Dockerfile
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
 USER samba
 WORKDIR /home/samba
 # samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file

diff --git a/bootstrap/generated-dists/ubuntu1804/Dockerfile b/bootstrap/generated-dists/ubuntu1804/Dockerfile
index 9ab534d7b9d01c7810270695a9836325e733238f..f389e0bb8171aa3b3d56b9d62cce07fac5704fcb 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804/Dockerfile
+++ b/bootstrap/generated-dists/ubuntu1804/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
 USER samba
 WORKDIR /home/samba
 # samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file

diff --git a/bootstrap/generated-dists/ubuntu2004/Dockerfile b/bootstrap/generated-dists/ubuntu2004/Dockerfile
index 4393c90f46e68be79cea9eb9e1793047e862f0f8..b77adb77460554d91d12e8acd0b13db35b2afcf3 100644 (file)
--- a/bootstrap/generated-dists/ubuntu2004/Dockerfile
+++ b/bootstrap/generated-dists/ubuntu2004/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
 USER samba
 WORKDIR /home/samba
 # samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file

diff --git a/bootstrap/generated-dists/ubuntu2204/Dockerfile b/bootstrap/generated-dists/ubuntu2204/Dockerfile
index 0b33264978755c1c9c31066eed3f1995b47d33f7..0b73aaceff516e16db821098664507f7c22e4ded 100644 (file)
--- a/bootstrap/generated-dists/ubuntu2204/Dockerfile
+++ b/bootstrap/generated-dists/ubuntu2204/Dockerfile
@@ -26,4 +26,4 @@ RUN useradd -m -U -s /bin/bash samba && \
 USER samba
 WORKDIR /home/samba
 # samba tests rely on this
-ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8
\ No newline at end of file
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 LANGUAGE=en_US
\ No newline at end of file

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 77937ea68004d7ca7ab143d188eedabc5a4cf6bd..bbeda07611d472c432d4fd3c16a091628099b440 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-6f4e1c3f1eb3b3236ae793c11def2135386a0ee9
+0b8b0640b6475650c8db301236c03c9ad732f52e