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

Merge branch 'locales' into 'master'

Browse source 
Add locales packages and set to en_US.UTF-8



See merge request !3
This commit is contained in:
Kamil Trzciński 2016-09-07 15:37:24 +00:00
commit d357ba3e55
5 changed files with 43 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Dockerfile.ruby-2.1
View file

@ -1,8 +1,14 @@
FROM ruby:2.1
ENV PACKAGES="git-core" \
LC_ALL=en_US.UTF-8
ENV PACKAGES="git-core"
ADD / /
RUN /scripts/install-essentials
# Set UTF-8 http://jaredmarkell.com/docker-and-locales/
# Must be set after install-essentials is run
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
RUN /scripts/install-phantomjs

10
Dockerfile.ruby-2.2
View file

@ -1,8 +1,14 @@
FROM ruby:2.2
ENV PACKAGES="git-core" \
LC_ALL=en_US.UTF-8
ENV PACKAGES="git-core"
ADD / /
RUN /scripts/install-essentials
# Set UTF-8 http://jaredmarkell.com/docker-and-locales/
# Must be set after install-essentials is run
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
RUN /scripts/install-phantomjs

10
Dockerfile.ruby-2.3
View file

@ -1,8 +1,14 @@
FROM ruby:2.3
ENV PACKAGES="git-core" \
LC_ALL=en_US.UTF-8
ENV PACKAGES="git-core"
ADD / /
RUN /scripts/install-essentials
# Set UTF-8 http://jaredmarkell.com/docker-and-locales/
# Must be set after install-essentials is run
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
RUN /scripts/install-phantomjs

11
Dockerfile.www-gitlab-com
View file

@ -1,7 +1,14 @@
FROM ruby:2.3
ENV PACKAGES="git-core nodejs pandoc texlive-latex-recommended texlive-xetex texlive-fonts-recommended ed" \
LC_ALL=en_US.UTF-8
ENV PACKAGES="git-core nodejs pandoc texlive-latex-recommended texlive-xetex texlive-fonts-recommended ed"
ADD / /
RUN /scripts/install-essentials
# Set UTF-8 http://jaredmarkell.com/docker-and-locales/
# Must be set after install-essentials is run
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
RUN rm -rf /var/lib/apt/lists/*

11
scripts/install-essentials
View file

@ -4,7 +4,7 @@ set -xeo pipefail
apt-get update
apt-get install -y \
curl wget build-essential \
curl wget build-essential apt-utils locales \
libssl-dev libyaml-dev libreadline6-dev zlib1g-dev \
libncurses5-dev libffi-dev libgdbm3 libgdbm-dev \
ca-certificates libyaml-dev checkinstall libxml2-dev \
@ -13,4 +13,13 @@ apt-get install -y \
libkrb5-dev postgresql-client mysql-client unzip \
$PACKAGES
# Set UTF-8
# http://stackoverflow.com/a/3182519/2137281
LOC=$'LC_ALL=en_US.UTF-8\nLANG=en_US.UTF-8'
echo "$LOC" > /etc/environment
cat /etc/environment
locale-gen "en_US en_US.UTF-8"
dpkg-reconfigure locales -f noninteractive -p critical
locale -a
rm -rf /var/lib/apt/lists/*