NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-08 17:42:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use C.UTF-8

Browse source
This commit is contained in:
Jan Provaznik 2021-12-13 10:31:08 +00:00 • committed by Rémy Coutable
parent dbf11edefc
commit 8bd9fd997e
17 changed files with 60 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile.custom
View file

@ -81,10 +81,10 @@ ARG BAZELISK_DOWNLOAD_SHA256
RUN if [ -n "$BAZELISK_VERSION" ] ; then /scripts/install-bazelisk $BAZELISK_VERSION $BAZELISK_DOWNLOAD_SHA256; fi 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=en_US.UTF-8 \ ENV LANG=C.UTF-8 \
LANGUAGE=en_US:en \ LANGUAGE=C \
LC_ALL=en_US.UTF-8 LC_ALL=C.UTF-8
# Set as env variables all versions configured # Set as env variables all versions configured
ENV RUBY_VERSION=${RUBY_VERSION} \ ENV RUBY_VERSION=${RUBY_VERSION} \

8
Dockerfile.omnibus-gitlab-bionic
View file

@ -6,11 +6,9 @@ RUN apt-get update -q \
&& apt-get clean -yqq \ && apt-get clean -yqq \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen ENV LANG C.UTF-8
RUN locale-gen en_US.UTF-8 ENV LANGUAGE C
ENV LANG en_US.UTF-8 ENV LC_ALL C.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV RUBY_VERSION 2.6.5 ENV RUBY_VERSION 2.6.5
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \

10
Dockerfile.omnibus-gitlab-buster
View file

@ -6,11 +6,11 @@ RUN apt-get update -q \
&& apt-get clean -yqq \ && apt-get clean -yqq \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen 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 en_US.UTF-8 ENV LANG C.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE C
ENV LC_ALL en_US.UTF-8 ENV LC_ALL C.UTF-8
ENV RUBY_VERSION 2.6.5 ENV RUBY_VERSION 2.6.5

2
Dockerfile.omnibus-gitlab-centos7
View file

@ -6,6 +6,8 @@ RUN yum update -y -q \
gcc gcc-c++ git make curl zlib-devel openssl-devel \ gcc gcc-c++ git make curl zlib-devel openssl-devel \
&& yum clean all && yum clean all
# it seems C.UTF-8 is not available in centos-7
# https://bugzilla.redhat.com/show_bug.cgi?id=1361965
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8
RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8

6
Dockerfile.omnibus-gitlab-centos8
View file

@ -6,9 +6,9 @@ RUN yum update -y -q \
gcc gcc-c++ git make curl zlib-devel openssl-devel glibc-locale-source \ gcc gcc-c++ git make curl zlib-devel openssl-devel glibc-locale-source \
&& yum clean all && yum clean all
ENV LANG en_US.UTF-8 ENV LANG C.UTF-8
ENV LC_ALL en_US.UTF-8 ENV LC_ALL C.UTF-8
RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 RUN localedef -c -f UTF-8 -i C C.UTF-8
ENV RUBY_VERSION 2.6.5 ENV RUBY_VERSION 2.6.5
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \

8
Dockerfile.omnibus-gitlab-focal
View file

@ -6,11 +6,9 @@ RUN apt-get update -q \
&& apt-get clean -yqq \ && apt-get clean -yqq \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen ENV LANG C.UTF-8
RUN locale-gen en_US.UTF-8 ENV LANGUAGE C
ENV LANG en_US.UTF-8 ENV LC_ALL C.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV RUBY_VERSION 2.6.5 ENV RUBY_VERSION 2.6.5
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \

10
Dockerfile.omnibus-gitlab-jessie
View file

@ -6,11 +6,11 @@ RUN apt-get update -q \
&& apt-get clean -yqq \ && apt-get clean -yqq \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen 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 en_US.UTF-8 ENV LANG C.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE C
ENV LC_ALL en_US.UTF-8 ENV LC_ALL C.UTF-8
ENV RUBY_VERSION 2.6.5 ENV RUBY_VERSION 2.6.5
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \

8
Dockerfile.omnibus-gitlab-opensuse15.1
View file

@ -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 \ gcc gcc-c++ git make curl zlib-devel libopenssl-devel glibc-i18ndata glibc-locale hostname \
&& zypper clean -a && zypper clean -a
ENV LANG en_US.UTF-8 ENV LANG C.UTF-8
ENV LC_ALL en_US.UTF-8 ENV LC_ALL C.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE C
RUN localedef -i en_US -f UTF-8 en_US.UTF-8 RUN localedef -i C -f UTF-8 C.UTF-8
ENV RUBY_VERSION 2.6.5 ENV RUBY_VERSION 2.6.5
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \

8
Dockerfile.omnibus-gitlab-opensuse15.2
View file

@ -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 \ gcc gcc-c++ git make curl zlib-devel libopenssl-devel glibc-i18ndata glibc-locale hostname \
&& zypper clean -a && zypper clean -a
ENV LANG en_US.UTF-8 ENV LANG C.UTF-8
ENV LC_ALL en_US.UTF-8 ENV LC_ALL C.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE C
RUN localedef -i en_US -f UTF-8 en_US.UTF-8 RUN localedef -i C -f UTF-8 C.UTF-8
ENV RUBY_VERSION 2.6.5 ENV RUBY_VERSION 2.6.5
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \

8
Dockerfile.omnibus-gitlab-opensuse15.3
View file

@ -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 \ gcc gcc-c++ git make curl zlib-devel libopenssl-devel glibc-i18ndata glibc-locale hostname \
&& zypper clean -a && zypper clean -a
ENV LANG en_US.UTF-8 ENV LANG C.UTF-8
ENV LC_ALL en_US.UTF-8 ENV LC_ALL C.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE C
RUN localedef -i en_US -f UTF-8 en_US.UTF-8 RUN localedef -i C -f UTF-8 C.UTF-8
ENV RUBY_VERSION 2.6.5 ENV RUBY_VERSION 2.6.5
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \

10
Dockerfile.omnibus-gitlab-stretch
View file

@ -6,11 +6,11 @@ RUN apt-get update -q \
&& apt-get clean -yqq \ && apt-get clean -yqq \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen 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 en_US.UTF-8 ENV LANG C.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE C
ENV LC_ALL en_US.UTF-8 ENV LC_ALL C.UTF-8
ENV RUBY_VERSION 2.6.5 ENV RUBY_VERSION 2.6.5

10
Dockerfile.omnibus-gitlab-wheezy
View file

@ -6,11 +6,11 @@ RUN apt-get update -q \
&& apt-get clean -yqq \ && apt-get clean -yqq \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen 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 en_US.UTF-8 ENV LANG C.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE C
ENV LC_ALL en_US.UTF-8 ENV LC_ALL C.UTF-8
ENV RUBY_VERSION 2.6.5 ENV RUBY_VERSION 2.6.5
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \

8
Dockerfile.omnibus-gitlab-xenial
View file

@ -6,11 +6,9 @@ RUN apt-get update -q \
&& apt-get clean -yqq \ && apt-get clean -yqq \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen ENV LANG C.UTF-8
RUN locale-gen en_US.UTF-8 ENV LANGUAGE C
ENV LANG en_US.UTF-8 ENV LC_ALL C.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV RUBY_VERSION 2.6.5 ENV RUBY_VERSION 2.6.5
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \

6
Dockerfile.release-tools
View file

@ -3,6 +3,6 @@ FROM ruby:2.7-alpine
RUN apk add --update --no-cache build-base cmake git openssh-client openssl-dev RUN apk add --update --no-cache build-base cmake git openssh-client openssl-dev
# Set UTF-8 http://jaredmarkell.com/docker-and-locales/ # Set UTF-8 http://jaredmarkell.com/docker-and-locales/
ENV LANG en_US.UTF-8 ENV LANG C.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE C
ENV LC_ALL en_US.UTF-8 ENV LC_ALL C.UTF-8

6
Dockerfile.www-gitlab-com-3.0
View file

@ -12,6 +12,6 @@ RUN cd /usr/bin && find ../lib/google-cloud-sdk/bin -type f -executable -exec ln
# Set UTF-8 http://jaredmarkell.com/docker-and-locales/ # Set UTF-8 http://jaredmarkell.com/docker-and-locales/
# Must be set after install-essentials is run # Must be set after install-essentials is run
ENV LANG en_US.UTF-8 ENV LANG C.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE C
ENV LC_ALL en_US.UTF-8 ENV LC_ALL C.UTF-8

4
scripts/install-essentials
View file

@ -37,10 +37,10 @@ fi
# Set UTF-8 # Set UTF-8
# http://stackoverflow.com/a/3182519/2137281 # http://stackoverflow.com/a/3182519/2137281
LOC=$'LC_ALL=en_US.UTF-8\nLANG=en_US.UTF-8' LOC=$'LC_ALL=C.UTF-8\nLANG=C.UTF-8'
echo "$LOC" > /etc/environment echo "$LOC" > /etc/environment
cat /etc/environment cat /etc/environment
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen echo "C.UTF-8 UTF-8" > /etc/locale.gen
locale-gen locale-gen
dpkg-reconfigure locales -f noninteractive -p critical dpkg-reconfigure locales -f noninteractive -p critical
locale -a locale -a

4
scripts/install-www-gitlab-com
View file

@ -36,9 +36,9 @@ mv gitlab-ci-multi-runner-linux-amd64 /usr/bin/gitlab-runner-helper
chmod +x /usr/bin/gitlab-runner-helper chmod +x /usr/bin/gitlab-runner-helper
# Set UTF-8 # Set UTF-8
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen echo "C.UTF-8 UTF-8" > /etc/locale.gen
locale-gen locale-gen
update-locale LANG=en_US.UTF-8 LC_CTYPE=en_US.UTF-8 LC_ALL=en_US.UTF-8 update-locale LANG=C.UTF-8 LC_CTYPE=C.UTF-8 LC_ALL=C.UTF-8
locale -a locale -a
# Clean up # Clean up