diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-23 21:08:31 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-23 21:08:31 +0300 |
commit | 7e1e5ca371cbfe77bdf56fcf65a4e749e6e86a06 (patch) | |
tree | c40953fc74404b5d86bb2ef72bab89526c5ca7d6 /qa/Dockerfile | |
parent | 9086e66ee72527839053ec6db19ed321a3b3a61b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/Dockerfile')
-rw-r--r-- | qa/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index 6310e4b290d..2f675cd71f0 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.6-stretch +FROM ruby:2.7-buster LABEL maintainer="GitLab Quality Department <quality@gitlab.com>" ENV DEBIAN_FRONTEND="noninteractive" @@ -65,7 +65,7 @@ COPY VERSION ./ee/app/models/license.r[b] /home/gitlab/ee/app/models/ COPY ./lib/gitlab.rb /home/gitlab/lib/ COPY ./lib/gitlab/utils.rb /home/gitlab/lib/gitlab/ COPY ./INSTALLATION_TYPE ./VERSION /home/gitlab/ -RUN cd /home/gitlab/qa/ && bundle install --jobs=$(nproc) --retry=3 --quiet +RUN cd /home/gitlab/qa/ && gem install bundler:1.17.3 && bundle install --jobs=$(nproc) --retry=3 --without=development --quiet COPY ./qa /home/gitlab/qa ENTRYPOINT ["bin/test"] |