Merge branch 'zj-ruby-2.3.3' into 'master'

Add image for ruby 2.3.3

Needed for: gitlab-org/gitlab-ce#24629

See merge request !18
This commit is contained in:
Kamil Trzciński 2016-12-02 10:40:46 +00:00
commit f8c63a305e
2 changed files with 5 additions and 2 deletions

View file

@ -29,12 +29,15 @@ before_script:
ruby-2.1-git-2.7-phantomjs-2.1 test: *test_build ruby-2.1-git-2.7-phantomjs-2.1 test: *test_build
ruby-2.3-git-2.7-phantomjs-2.1 test: *test_build 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_build
ruby-2.3-static-analyses test: *test_build ruby-2.3-static-analyses test: *test_build
www-gitlab-com test: *test_build www-gitlab-com test: *test_build
doc-gitlab-com test: *test_build doc-gitlab-com test: *test_build
ruby-2.1-git-2.7-phantomjs-2.1: *build_and_deploy ruby-2.1-git-2.7-phantomjs-2.1: *build_and_deploy
ruby-2.3-git-2.7-phantomjs-2.1: *build_and_deploy 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-git-2.7-phantomjs-2.1: *build_and_deploy
ruby-2.3-static-analyses: *build_and_deploy ruby-2.3-static-analyses: *build_and_deploy
www-gitlab-com: *build_and_deploy www-gitlab-com: *build_and_deploy
doc-gitlab-com: *build_and_deploy doc-gitlab-com: *build_and_deploy

View file

@ -1,4 +1,4 @@
FROM ruby:2.3 FROM ruby:2.3.3
ADD / / ADD / /
RUN /scripts/install-essentials RUN /scripts/install-essentials
@ -8,4 +8,4 @@ RUN /scripts/install-node
RUN locale-gen en_US.UTF-8 RUN locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8