Merge branch 'add-runner-binary-for-kube' into 'master'

Add gitlab-runner binary to www-gitlab-com

This request will add the `gitlab-runner` binary to the www-gitlab-com image. This is required to make CI work on a kubernetes cluster. 

This is a workaround for https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1908 and is needed for https://gitlab.com/gitlab-com/infrastructure/issues/749

See merge request !19
This commit is contained in:
Kamil Trzciński 2016-12-15 11:06:58 +00:00
commit a1fd432579

View file

@ -5,6 +5,9 @@ ENV PACKAGES="git-core pandoc texlive-latex-recommended texlive-xetex texlive-fo
ADD / /
RUN /scripts/install-www-gitlab-com
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/
# Must be set after install-essentials is run
ENV LANG en_US.UTF-8