From: Stefan Metzmacher Date: Fri, 9 Jun 2023 12:02:48 +0000 (+0200) Subject: bootstrap: force use of LANGUAGE=en_US X-Git-Tag: talloc-2.4.1~467 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62e189825ec44ed7c021d92e6fea0dd5ab16edfb;p=thirdparty%2Fsamba.git bootstrap: force use of LANGUAGE=en_US Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett --- diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 279c1087789..d5390c8821d 100644 --- 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 c67ab9184ab..f61e52a7aea 100644 --- 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 ccb46541106..a11c4dbf169 100644 --- 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 6f8a883b075..3b5a681118f 100644 --- 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 b7a46ca53e5..90a961f5345 100644 --- 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 10002774e20..56426229c2b 100644 --- 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 a6bdd6cb328..621a3656389 100644 --- 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 3d0c21c1434..4feffbd3d8f 100644 --- 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 9ab534d7b9d..f389e0bb817 100644 --- 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 4393c90f46e..b77adb77460 100644 --- 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 0b332649787..0b73aaceff5 100644 --- 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 77937ea6800..bbeda07611d 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -6f4e1c3f1eb3b3236ae793c11def2135386a0ee9 +0b8b0640b6475650c8db301236c03c9ad732f52e