diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-08 21:05:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-08 21:05:56 +0300 |
| commit | 40597fdec080d55d36e97aab1a0b98dfc35517b9 (patch) | |
| tree | 20cb97ab39cd511c22657cc23c5834464001feac /qa | |
| parent | a712542edb9d52105409462de3e56d2a6d6f6c7a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/Dockerfile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index 97c2cd482f5..e695ab82969 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -49,12 +49,10 @@ 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 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 ./VERSION /home/gitlab/ RUN cd /home/gitlab/qa/ && bundle install --jobs=$(nproc) --retry=3 --quiet |