From f77e611bdf56d4ab7aace95a7a8941605317b2d4 Mon Sep 17 00:00:00 2001 From: Jan Provaznik Date: Wed, 24 Nov 2021 15:24:17 +0100 Subject: [PATCH] Use C everywhere --- Dockerfile.custom | 4 ++-- Dockerfile.omnibus-gitlab-bionic | 4 ++-- Dockerfile.omnibus-gitlab-buster | 4 ++-- Dockerfile.omnibus-gitlab-centos7 | 2 +- Dockerfile.omnibus-gitlab-centos8 | 2 +- Dockerfile.omnibus-gitlab-focal | 4 ++-- Dockerfile.omnibus-gitlab-jessie | 4 ++-- Dockerfile.omnibus-gitlab-opensuse15.1 | 4 ++-- Dockerfile.omnibus-gitlab-opensuse15.2 | 8 ++++---- Dockerfile.omnibus-gitlab-opensuse15.3 | 8 ++++---- Dockerfile.omnibus-gitlab-stretch | 4 ++-- Dockerfile.omnibus-gitlab-wheezy | 4 ++-- Dockerfile.omnibus-gitlab-xenial | 4 ++-- Dockerfile.release-tools | 2 +- Dockerfile.www-gitlab-com-3.0 | 2 +- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Dockerfile.custom b/Dockerfile.custom index 1feec35..62b9c05 100644 --- a/Dockerfile.custom +++ b/Dockerfile.custom @@ -81,9 +81,9 @@ ARG BAZELISK_DOWNLOAD_SHA256 RUN if [ -n "$BAZELISK_VERSION" ] ; then /scripts/install-bazelisk $BAZELISK_VERSION $BAZELISK_DOWNLOAD_SHA256; fi -RUN locale-gen en_US.UTF-8 +RUN locale-gen C.UTF-8 ENV LANG=C.UTF-8 \ - LANGUAGE=en_US:en \ + LANGUAGE=C \ LC_ALL=C.UTF-8 # Set as env variables all versions configured diff --git a/Dockerfile.omnibus-gitlab-bionic b/Dockerfile.omnibus-gitlab-bionic index ed980e0..c41ee9a 100644 --- a/Dockerfile.omnibus-gitlab-bionic +++ b/Dockerfile.omnibus-gitlab-bionic @@ -7,9 +7,9 @@ RUN apt-get update -q \ && rm -rf /var/lib/apt/lists/* RUN echo "C.UTF-8 UTF-8" > /etc/locale.gen -RUN locale-gen en_US.UTF-8 +RUN locale-gen C.UTF-8 ENV LANG C.UTF-8 -ENV LANGUAGE en_US:en +ENV LANGUAGE C ENV LC_ALL C.UTF-8 ENV RUBY_VERSION 2.6.5 diff --git a/Dockerfile.omnibus-gitlab-buster b/Dockerfile.omnibus-gitlab-buster index 669824d..4685854 100644 --- a/Dockerfile.omnibus-gitlab-buster +++ b/Dockerfile.omnibus-gitlab-buster @@ -7,9 +7,9 @@ RUN apt-get update -q \ && rm -rf /var/lib/apt/lists/* RUN echo "C.UTF-8 UTF-8" > /etc/locale.gen -RUN locale-gen en_US.UTF-8 +RUN locale-gen C.UTF-8 ENV LANG C.UTF-8 -ENV LANGUAGE en_US:en +ENV LANGUAGE C ENV LC_ALL C.UTF-8 diff --git a/Dockerfile.omnibus-gitlab-centos7 b/Dockerfile.omnibus-gitlab-centos7 index 298f1f6..e0ae3ab 100644 --- a/Dockerfile.omnibus-gitlab-centos7 +++ b/Dockerfile.omnibus-gitlab-centos7 @@ -8,7 +8,7 @@ RUN yum update -y -q \ ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 -RUN localedef -c -f UTF-8 -i en_US C.UTF-8 +RUN localedef -c -f UTF-8 -i C C.UTF-8 ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ diff --git a/Dockerfile.omnibus-gitlab-centos8 b/Dockerfile.omnibus-gitlab-centos8 index 7b4fad6..98de3e5 100644 --- a/Dockerfile.omnibus-gitlab-centos8 +++ b/Dockerfile.omnibus-gitlab-centos8 @@ -8,7 +8,7 @@ RUN yum update -y -q \ ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 -RUN localedef -c -f UTF-8 -i en_US C.UTF-8 +RUN localedef -c -f UTF-8 -i C C.UTF-8 ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ diff --git a/Dockerfile.omnibus-gitlab-focal b/Dockerfile.omnibus-gitlab-focal index 2b48184..249eee8 100644 --- a/Dockerfile.omnibus-gitlab-focal +++ b/Dockerfile.omnibus-gitlab-focal @@ -7,9 +7,9 @@ RUN apt-get update -q \ && rm -rf /var/lib/apt/lists/* RUN echo "C.UTF-8 UTF-8" > /etc/locale.gen -RUN locale-gen en_US.UTF-8 +RUN locale-gen C.UTF-8 ENV LANG C.UTF-8 -ENV LANGUAGE en_US:en +ENV LANGUAGE C ENV LC_ALL C.UTF-8 ENV RUBY_VERSION 2.6.5 diff --git a/Dockerfile.omnibus-gitlab-jessie b/Dockerfile.omnibus-gitlab-jessie index fb5e06e..4ad84e1 100644 --- a/Dockerfile.omnibus-gitlab-jessie +++ b/Dockerfile.omnibus-gitlab-jessie @@ -7,9 +7,9 @@ RUN apt-get update -q \ && rm -rf /var/lib/apt/lists/* RUN echo "C.UTF-8 UTF-8" > /etc/locale.gen -RUN locale-gen en_US.UTF-8 +RUN locale-gen C.UTF-8 ENV LANG C.UTF-8 -ENV LANGUAGE en_US:en +ENV LANGUAGE C ENV LC_ALL C.UTF-8 ENV RUBY_VERSION 2.6.5 diff --git a/Dockerfile.omnibus-gitlab-opensuse15.1 b/Dockerfile.omnibus-gitlab-opensuse15.1 index 0a03053..74c8d2f 100644 --- a/Dockerfile.omnibus-gitlab-opensuse15.1 +++ b/Dockerfile.omnibus-gitlab-opensuse15.1 @@ -8,8 +8,8 @@ RUN zypper -q -n --gpg-auto-import-keys update \ ENV LANG C.UTF-8 ENV LC_ALL C.UTF-8 -ENV LANGUAGE en_US:en -RUN localedef -i en_US -f UTF-8 C.UTF-8 +ENV LANGUAGE C +RUN localedef -i C -f UTF-8 C.UTF-8 ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ diff --git a/Dockerfile.omnibus-gitlab-opensuse15.2 b/Dockerfile.omnibus-gitlab-opensuse15.2 index 3f618c8..1ccc4db 100644 --- a/Dockerfile.omnibus-gitlab-opensuse15.2 +++ b/Dockerfile.omnibus-gitlab-opensuse15.2 @@ -6,10 +6,10 @@ RUN zypper -q -n --gpg-auto-import-keys update \ gcc gcc-c++ git make curl zlib-devel libopenssl-devel glibc-i18ndata glibc-locale hostname \ && zypper clean -a -ENV LANG en_US.UTF-8 -ENV LC_ALL en_US.UTF-8 -ENV LANGUAGE en_US:en -RUN localedef -i en_US -f UTF-8 en_US.UTF-8 +ENV LANG C.UTF-8 +ENV LC_ALL C.UTF-8 +ENV LANGUAGE C +RUN localedef -i C -f UTF-8 C.UTF-8 ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ diff --git a/Dockerfile.omnibus-gitlab-opensuse15.3 b/Dockerfile.omnibus-gitlab-opensuse15.3 index 735d01a..98b08ba 100644 --- a/Dockerfile.omnibus-gitlab-opensuse15.3 +++ b/Dockerfile.omnibus-gitlab-opensuse15.3 @@ -6,10 +6,10 @@ RUN zypper -q -n --gpg-auto-import-keys update \ gcc gcc-c++ git make curl zlib-devel libopenssl-devel glibc-i18ndata glibc-locale hostname \ && zypper clean -a -ENV LANG en_US.UTF-8 -ENV LC_ALL en_US.UTF-8 -ENV LANGUAGE en_US:en -RUN localedef -i en_US -f UTF-8 en_US.UTF-8 +ENV LANG C.UTF-8 +ENV LC_ALL C.UTF-8 +ENV LANGUAGE C +RUN localedef -i C -f UTF-8 C.UTF-8 ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ diff --git a/Dockerfile.omnibus-gitlab-stretch b/Dockerfile.omnibus-gitlab-stretch index 45eb0c1..0326e83 100644 --- a/Dockerfile.omnibus-gitlab-stretch +++ b/Dockerfile.omnibus-gitlab-stretch @@ -7,9 +7,9 @@ RUN apt-get update -q \ && rm -rf /var/lib/apt/lists/* RUN echo "C.UTF-8 UTF-8" > /etc/locale.gen -RUN locale-gen en_US.UTF-8 +RUN locale-gen C.UTF-8 ENV LANG C.UTF-8 -ENV LANGUAGE en_US:en +ENV LANGUAGE C ENV LC_ALL C.UTF-8 diff --git a/Dockerfile.omnibus-gitlab-wheezy b/Dockerfile.omnibus-gitlab-wheezy index a2c989d..eb31301 100644 --- a/Dockerfile.omnibus-gitlab-wheezy +++ b/Dockerfile.omnibus-gitlab-wheezy @@ -7,9 +7,9 @@ RUN apt-get update -q \ && rm -rf /var/lib/apt/lists/* RUN echo "C.UTF-8 UTF-8" > /etc/locale.gen -RUN locale-gen en_US.UTF-8 +RUN locale-gen C.UTF-8 ENV LANG C.UTF-8 -ENV LANGUAGE en_US:en +ENV LANGUAGE C ENV LC_ALL C.UTF-8 ENV RUBY_VERSION 2.6.5 diff --git a/Dockerfile.omnibus-gitlab-xenial b/Dockerfile.omnibus-gitlab-xenial index 25aff4f..1644c8a 100644 --- a/Dockerfile.omnibus-gitlab-xenial +++ b/Dockerfile.omnibus-gitlab-xenial @@ -7,9 +7,9 @@ RUN apt-get update -q \ && rm -rf /var/lib/apt/lists/* RUN echo "C.UTF-8 UTF-8" > /etc/locale.gen -RUN locale-gen en_US.UTF-8 +RUN locale-gen C.UTF-8 ENV LANG C.UTF-8 -ENV LANGUAGE en_US:en +ENV LANGUAGE C ENV LC_ALL C.UTF-8 ENV RUBY_VERSION 2.6.5 diff --git a/Dockerfile.release-tools b/Dockerfile.release-tools index fe4116b..aba3a70 100644 --- a/Dockerfile.release-tools +++ b/Dockerfile.release-tools @@ -4,5 +4,5 @@ RUN apk add --update --no-cache build-base cmake git openssh-client openssl-dev # Set UTF-8 http://jaredmarkell.com/docker-and-locales/ ENV LANG C.UTF-8 -ENV LANGUAGE en_US:en +ENV LANGUAGE C ENV LC_ALL C.UTF-8 diff --git a/Dockerfile.www-gitlab-com-3.0 b/Dockerfile.www-gitlab-com-3.0 index c2e11db..bff1121 100644 --- a/Dockerfile.www-gitlab-com-3.0 +++ b/Dockerfile.www-gitlab-com-3.0 @@ -13,5 +13,5 @@ RUN cd /usr/bin && find ../lib/google-cloud-sdk/bin -type f -executable -exec ln # Set UTF-8 http://jaredmarkell.com/docker-and-locales/ # Must be set after install-essentials is run ENV LANG C.UTF-8 -ENV LANGUAGE en_US:en +ENV LANGUAGE C ENV LC_ALL C.UTF-8