mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-09 10:02:56 +01:00
Skip locale-gen for some ubuntu distros
C.UTF-8 is pregenerated anyway, so no need to re-run it. Also defaults to en_US for centos 7 because C.UTF-8 is not available there.
This commit is contained in:
parent
f77e611bdf
commit
dd836768c3
4 changed files with 5 additions and 9 deletions
|
|
@ -6,8 +6,6 @@ RUN apt-get update -q \
|
|||
&& apt-get clean -yqq \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN echo "C.UTF-8 UTF-8" > /etc/locale.gen
|
||||
RUN locale-gen C.UTF-8
|
||||
ENV LANG C.UTF-8
|
||||
ENV LANGUAGE C
|
||||
ENV LC_ALL C.UTF-8
|
||||
|
|
|
|||
|
|
@ -6,9 +6,11 @@ RUN yum update -y -q \
|
|||
gcc gcc-c++ git make curl zlib-devel openssl-devel \
|
||||
&& yum clean all
|
||||
|
||||
ENV LANG C.UTF-8
|
||||
ENV LC_ALL C.UTF-8
|
||||
RUN localedef -c -f UTF-8 -i C C.UTF-8
|
||||
# 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 LC_ALL en_US.UTF-8
|
||||
RUN localedef -c -f UTF-8 -i en_US en_US.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" \
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@ RUN apt-get update -q \
|
|||
&& apt-get clean -yqq \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN echo "C.UTF-8 UTF-8" > /etc/locale.gen
|
||||
RUN locale-gen C.UTF-8
|
||||
ENV LANG C.UTF-8
|
||||
ENV LANGUAGE C
|
||||
ENV LC_ALL C.UTF-8
|
||||
|
|
|
|||
|
|
@ -6,8 +6,6 @@ RUN apt-get update -q \
|
|||
&& apt-get clean -yqq \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN echo "C.UTF-8 UTF-8" > /etc/locale.gen
|
||||
RUN locale-gen C.UTF-8
|
||||
ENV LANG C.UTF-8
|
||||
ENV LANGUAGE C
|
||||
ENV LC_ALL C.UTF-8
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue