diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 03:06:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 03:06:03 +0300 |
| commit | 8c726c7487db581867ade785f798d84315cb787e (patch) | |
| tree | aaf96b1cf74942fbb26b2aa379f9d51c8f874617 /qa/Dockerfile | |
| parent | 1da3754b25657f49afdcb0b942506d365b1ee89d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/Dockerfile')
| -rw-r--r-- | qa/Dockerfile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index 84dbfae1008..97c2cd482f5 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -49,13 +49,15 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \ WORKDIR /home/gitlab/qa COPY ./qa/Gemfile* /home/gitlab/qa/ +COPY ./config/light_settings.rb /home/gitlab/config/light_settings.rb COPY ./config/initializers/0_inject_enterprise_edition_module.rb /home/gitlab/config/initializers/ -# Copy VERSION to ensure the COPY succeeds to copy at least one file since ee/app/models/license.rb isn't present in CE +# Copy VERSION to ensure the COPY succeeds to copy at least one file since ee/app/models/license.rb isn't present in FOSS +# The [b] part makes ./ee/app/models/license.r[b] a pattern that is allowed to return no files (which is the case in FOSS) COPY VERSION ./ee/app/models/license.r[b] /home/gitlab/ee/app/models/ +COPY ./config/light_settings.rb /home/gitlab/config/ COPY ./lib/gitlab.rb /home/gitlab/lib/ -COPY ./INSTALLATION_TYPE /home/gitlab/ -COPY ./VERSION /home/gitlab/ -RUN cd /home/gitlab/qa/ && bundle install +COPY ./INSTALLATION_TYPE ./VERSION /home/gitlab/ +RUN cd /home/gitlab/qa/ && bundle install --jobs=$(nproc) --retry=3 --quiet COPY ./qa /home/gitlab/qa ENTRYPOINT ["bin/test"] |