diff options
| author | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2019-08-25 11:00:08 +0000 |
|---|---|---|
| committer | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2019-08-25 11:00:08 +0000 |
| commit | f2371a89f151da21e2d139f7cb159d611ba6fd0b (patch) | |
| tree | 5692b4b958026565e4438063a522942d9da428eb /qa/Dockerfile | |
| parent | d90b361b7c8c1aa7faa9ef1ead40e096d4ae7e42 (diff) | |
| parent | 8112fb37544557b3f94c0a558175d5da99ef9829 (diff) | |
| download | gitlab-ce-f2371a89f151da21e2d139f7cb159d611ba6fd0b.tar.gz | |
Merge branch 'master' into 'docs-gitaly-path-fixes'docs-gitaly-path-fixes
# Conflicts:
# doc/administration/gitaly/index.md
Diffstat (limited to 'qa/Dockerfile')
| -rw-r--r-- | qa/Dockerfile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/qa/Dockerfile b/qa/Dockerfile index 74be373b8e8..3309f5b6ce3 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -47,9 +47,13 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \ curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \ apt-get update -y && apt-get install google-cloud-sdk kubectl -y -WORKDIR /home/qa -COPY ./Gemfile* ./ -RUN bundle install -COPY ./ ./ +WORKDIR /home/gitlab/qa +COPY ./qa/Gemfile* /home/gitlab/qa/ +COPY ./config/initializers/0_inject_enterprise_edition_module.rb /home/gitlab/config/initializers/ +COPY ./lib/gitlab.rb /home/gitlab/lib/ +COPY ./INSTALLATION_TYPE /home/gitlab/ +COPY ./VERSION /home/gitlab/ +RUN cd /home/gitlab/qa/ && bundle install +COPY ./qa /home/gitlab/qa ENTRYPOINT ["bin/test"] |