Merge branch 'jivl-add-node-yarn-to-www-gitlab-com' into 'master'

Add node and yarn to the www-gitlab-com image

See merge request gitlab-org/gitlab-build-images!64
This commit is contained in:
Stan Hu 2017-11-08 19:59:41 +00:00
commit acf2ba5c1d

View file

@ -1,10 +1,15 @@
FROM ruby:2.3-slim
ENV PACKAGES="git-core pandoc texlive-latex-recommended texlive-xetex texlive-fonts-recommended lmodern ed file"
ENV PACKAGES="git-core pandoc texlive-latex-recommended texlive-xetex texlive-fonts-recommended lmodern ed file curl"
ADD / /
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