From b19c8abae41a41a51cae9bcde7c029939714191d Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Fri, 30 Jun 2017 12:56:15 +0000 Subject: [PATCH] Add locales to omnibus images. --- Dockerfile.omnibus-gitlab-centos6 | 4 ++++ Dockerfile.omnibus-gitlab-centos7 | 4 ++++ Dockerfile.omnibus-gitlab-jessie | 8 +++++++- Dockerfile.omnibus-gitlab-opensuse42.2 | 7 ++++++- Dockerfile.omnibus-gitlab-stretch | 9 ++++++++- Dockerfile.omnibus-gitlab-wheezy | 8 +++++++- Dockerfile.omnibus-gitlab-xenial | 8 +++++++- 7 files changed, 43 insertions(+), 5 deletions(-) diff --git a/Dockerfile.omnibus-gitlab-centos6 b/Dockerfile.omnibus-gitlab-centos6 index a7c8274..b829b96 100644 --- a/Dockerfile.omnibus-gitlab-centos6 +++ b/Dockerfile.omnibus-gitlab-centos6 @@ -5,6 +5,10 @@ RUN yum groupinstall -y Development Tools RUN yum install -y \ gcc git make curl zlib-devel openssl-devel +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.3.3 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ diff --git a/Dockerfile.omnibus-gitlab-centos7 b/Dockerfile.omnibus-gitlab-centos7 index fdd607e..acbab73 100644 --- a/Dockerfile.omnibus-gitlab-centos7 +++ b/Dockerfile.omnibus-gitlab-centos7 @@ -5,6 +5,10 @@ RUN yum groupinstall -y Development Tools RUN yum install -y \ gcc git make curl zlib-devel openssl-devel +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.3.3 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ diff --git a/Dockerfile.omnibus-gitlab-jessie b/Dockerfile.omnibus-gitlab-jessie index c37780c..b075aaf 100644 --- a/Dockerfile.omnibus-gitlab-jessie +++ b/Dockerfile.omnibus-gitlab-jessie @@ -1,9 +1,15 @@ FROM debian:jessie RUN apt-get update -q \ - && apt-get install -y gcc git make curl zlib1g-dev libssl-dev \ + && apt-get install -y gcc git make curl zlib1g-dev libssl-dev locales\ && rm -rf /var/lib/apt/lists/* +RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8 + ENV RUBY_VERSION 2.3.3 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ diff --git a/Dockerfile.omnibus-gitlab-opensuse42.2 b/Dockerfile.omnibus-gitlab-opensuse42.2 index 591b252..bed6040 100644 --- a/Dockerfile.omnibus-gitlab-opensuse42.2 +++ b/Dockerfile.omnibus-gitlab-opensuse42.2 @@ -3,7 +3,12 @@ FROM opensuse:42.2 RUN zypper -q -n --gpg-auto-import-keys update RUN zypper -q -n in -t pattern devel_perl devel_basis RUN zypper -q -n install \ - gcc git make curl zlib-devel libopenssl-devel + gcc git make curl zlib-devel libopenssl-devel glibc-i18ndata glibc-locale + +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 RUBY_VERSION 2.3.3 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \ diff --git a/Dockerfile.omnibus-gitlab-stretch b/Dockerfile.omnibus-gitlab-stretch index dcf5434..ee1b48c 100644 --- a/Dockerfile.omnibus-gitlab-stretch +++ b/Dockerfile.omnibus-gitlab-stretch @@ -1,9 +1,16 @@ FROM debian:stretch RUN apt-get update -q \ - && apt-get install -y gcc git make curl zlib1g-dev libssl1.0-dev \ + && apt-get install -y gcc git make curl zlib1g-dev libssl1.0-dev locales \ && rm -rf /var/lib/apt/lists/* +RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8 + + ENV RUBY_VERSION 2.3.3 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ diff --git a/Dockerfile.omnibus-gitlab-wheezy b/Dockerfile.omnibus-gitlab-wheezy index bf27309..b519016 100644 --- a/Dockerfile.omnibus-gitlab-wheezy +++ b/Dockerfile.omnibus-gitlab-wheezy @@ -1,9 +1,15 @@ FROM debian:wheezy RUN apt-get update -q \ - && apt-get install -y gcc git make libc6-dev curl zlib1g-dev libssl-dev \ + && apt-get install -y gcc git make libc6-dev curl zlib1g-dev libssl-dev locales \ && rm -rf /var/lib/apt/lists/* +RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8 + ENV RUBY_VERSION 2.3.3 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ diff --git a/Dockerfile.omnibus-gitlab-xenial b/Dockerfile.omnibus-gitlab-xenial index 93c6c81..1fd91f4 100644 --- a/Dockerfile.omnibus-gitlab-xenial +++ b/Dockerfile.omnibus-gitlab-xenial @@ -1,9 +1,15 @@ FROM ubuntu:16.04 RUN apt-get update -q \ - && apt-get install -y gcc git make curl zlib1g-dev libssl-dev \ + && apt-get install -y gcc git make curl zlib1g-dev libssl-dev locales \ && rm -rf /var/lib/apt/lists/* +RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8 + ENV RUBY_VERSION 2.3.3 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \