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

Install imagemagick in www-gitlab-com docker image

Browse source
This commit is contained in:
Lukas Eipert 2018-10-30 17:18:25 +01:00
parent 929fb5266c
commit 35fc800e29
No known key found for this signature in database
GPG key ID: 148BEA37CB35B2AC
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Dockerfile.www-gitlab-com-2.4
View file

@ -1,16 +1,8 @@
FROM ruby:2.4-slim FROM ruby:2.4-slim
ADD / / ADD /scripts/ /scripts/
RUN /scripts/install-www-gitlab-com RUN /scripts/install-www-gitlab-com
# NodeJS and Yarn
ARG NODE_INSTALL_VERSION=8.x
ARG YARN_INSTALL_VERSION=1.2.1-1
RUN /scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version
ADD https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-ci-multi-runner-linux-amd64 /usr/bin/gitlab-runner-helper
RUN chmod +x /usr/bin/gitlab-runner-helper
# Set UTF-8 http://jaredmarkell.com/docker-and-locales/ # Set UTF-8 http://jaredmarkell.com/docker-and-locales/
# Must be set after install-essentials is run # Must be set after install-essentials is run
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8

17
scripts/install-www-gitlab-com
View file

@ -5,19 +5,32 @@ IFS=$'\n\t'
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
# Install LaTeX and pandoc 2.3.1
apt-get update apt-get update
apt-get install -yq --no-install-recommends \ apt-get install -yq --no-install-recommends \
make gcc g++ locales \ make gcc g++ locales \
git-core texlive-latex-recommended texlive-xetex \ git-core texlive-latex-recommended texlive-xetex \
texlive-fonts-recommended lmodern ed file curl gnupg2 texlive-fonts-recommended lmodern ed file curl gnupg2 \
# Install pandoc v2.3.1
cd /tmp cd /tmp
curl -L -O https://github.com/jgm/pandoc/releases/download/2.3.1/pandoc-2.3.1-linux.tar.gz curl -L -O https://github.com/jgm/pandoc/releases/download/2.3.1/pandoc-2.3.1-linux.tar.gz
tar xvf pandoc-2.3.1-linux.tar.gz tar xvf pandoc-2.3.1-linux.tar.gz
cp pandoc-2.3.1/bin/* /usr/local/bin cp pandoc-2.3.1/bin/* /usr/local/bin
rm -rf /tmp/pandoc* rm -rf /tmp/pandoc*
# For cropping the pictures on the team page
apt-get install -yq --no-install-recommends imagemagick
# Installing node & yarn
NODE_INSTALL_VERSION=8.x
YARN_INSTALL_VERSION=1.2.1-1
/scripts/install-node $NODE_INSTALL_VERSION $YARN_INSTALL_VERSION && node --version && yarn --version
# Installing gitlab-runner
curl -O -J -L https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/latest/binaries/gitlab-ci-multi-runner-linux-amd64
mv gitlab-ci-multi-runner-linux-amd64 /usr/bin/gitlab-runner-helper
chmod +x /usr/bin/gitlab-runner-helper
# Set UTF-8 # Set UTF-8
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
locale-gen locale-gen