Merge branch 'zj-ruby-2-4' into 'master'

Add Ruby 2.4 dockerfile

See merge request !40
This commit is contained in:
Zeger-Jan van de Weg 2017-05-30 13:36:38 +00:00
commit 0effba54c6
2 changed files with 17 additions and 0 deletions

View file

@ -32,6 +32,7 @@ ruby-2.3-git-2.7-phantomjs-2.1 test: *test_build
ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1 test: *test_build
ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1 test: *test_build
ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_build
ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_build
www-gitlab-com test: *test_build
doc-gitlab-com test: *test_build
gitlab-qa test: *test_build
@ -52,6 +53,7 @@ ruby-2.3-git-2.7-phantomjs-2.1: *build_and_deploy
ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1: *build_and_deploy
ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1: *build_and_deploy
ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy
ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy
www-gitlab-com: *build_and_deploy
doc-gitlab-com: *build_and_deploy
gitlab-qa: *build_and_deploy

View file

@ -0,0 +1,15 @@
FROM ruby:2.4.1
ADD / /
RUN /scripts/install-essentials
RUN /scripts/install-phantomjs 2.1.1
RUN /scripts/install-node
RUN /scripts/install-golang
RUN /scripts/install-postgresql
ENV PATH /usr/local/go/bin:$PATH
RUN locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8