diff --git a/Dockerfile.www-gitlab-com b/Dockerfile.www-gitlab-com index 3e9efcc..613cf4e 100644 --- a/Dockerfile.www-gitlab-com +++ b/Dockerfile.www-gitlab-com @@ -1,14 +1,12 @@ -FROM ruby:2.3 +FROM ruby:2.3-slim -ENV PACKAGES="git-core nodejs pandoc texlive-latex-recommended texlive-xetex texlive-fonts-recommended ed" +ENV PACKAGES="git-core pandoc texlive-latex-recommended texlive-xetex texlive-fonts-recommended lmodern ed" ADD / / -RUN /scripts/install-essentials +RUN /scripts/install-www-gitlab-com # 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/* diff --git a/scripts/install-www-gitlab-com b/scripts/install-www-gitlab-com new file mode 100755 index 0000000..3593997 --- /dev/null +++ b/scripts/install-www-gitlab-com @@ -0,0 +1,18 @@ +#!/bin/bash + +set -xeo pipefail + +apt-get update +apt-get install -yq --no-install-recommends \ + make gcc g++ locales \ + $PACKAGES + +apt-get autoremove -yq + +# Set UTF-8 +echo "en_US.UTF-8 UTF-8" > /etc/locale.gen +locale-gen +update-locale LANG=en_US.UTF-8 LC_CTYPE=en_US.UTF-8 LC_ALL=en_US.UTF-8 +locale -a + +rm -rf /var/lib/apt/lists/*