diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-08-06 14:50:52 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-08-19 09:44:53 +0200 |
| commit | b601cfcfa707235d7f5eed43bfbe0d3956adff40 (patch) | |
| tree | 015c03e9f1ae35ac0707ca9c3e0d85f848777fff /qa/Dockerfile | |
| parent | 6aa215aaea146f21eb5a88a511f7bbe84ad31ef5 (diff) | |
| download | gitlab-ce-b601cfcfa707235d7f5eed43bfbe0d3956adff40.tar.gz | |
Update qa/Dockerfile to be built from the project root context
Signed-off-by: Rémy Coutable <remy@rymai.me>
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"] |