mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-09 10:02:56 +01:00
Merge branch 'www-gitlab-com-slim' into 'master'
Make the www-gitlab-com image smaller Fixes #4 See merge request !12
This commit is contained in:
commit
1c33d8a3b2
2 changed files with 21 additions and 5 deletions
|
|
@ -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/*
|
||||
|
|
|
|||
18
scripts/install-www-gitlab-com
Executable file
18
scripts/install-www-gitlab-com
Executable file
|
|
@ -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/*
|
||||
Loading…
Add table
Add a link
Reference in a new issue