diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-16 18:07:30 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-16 18:07:30 +0000 |
| commit | 279585c57ba943a4abfff170cc610bf23f88fcba (patch) | |
| tree | 7efea9a1d255c3404cb0b8e217fbf3f867314dc7 | |
| parent | fc1a192e801d8468d83302d8992feed051e88288 (diff) | |
| parent | c204245b27c07e0425d19746a51c6066f3faa14c (diff) | |
| download | gitlab-ce-279585c57ba943a4abfff170cc610bf23f88fcba.tar.gz | |
Merge branch 'feature/gb/speed-up-gitlab-qa-docker-image-builds' into 'master'
Speed up GitLab QA docker image builds
Closes gitlab-qa#33
See merge request !10000
| -rw-r--r-- | qa/.gitignore | 1 | ||||
| -rw-r--r-- | qa/Dockerfile | 5 | ||||
| -rw-r--r-- | qa/Gemfile.lock | 61 |
3 files changed, 66 insertions, 1 deletions
diff --git a/qa/.gitignore b/qa/.gitignore new file mode 100644 index 00000000000..3fec32c8427 --- /dev/null +++ b/qa/.gitignore @@ -0,0 +1 @@ +tmp/ diff --git a/qa/Dockerfile b/qa/Dockerfile index 2814a7bdef0..72c82503542 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -8,7 +8,10 @@ RUN sed -i "s/httpredir.debian.org/ftp.us.debian.org/" /etc/apt/sources.list && WORKDIR /home/qa -COPY ./ ./ +COPY ./Gemfile* ./ + RUN bundle install +COPY ./ ./ + ENTRYPOINT ["bin/test"] diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock new file mode 100644 index 00000000000..6de2abff198 --- /dev/null +++ b/qa/Gemfile.lock @@ -0,0 +1,61 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) + capybara (2.12.1) + addressable + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + capybara-screenshot (1.0.14) + capybara (>= 1.0, < 3) + launchy + capybara-webkit (1.12.0) + capybara (>= 2.3.0, < 2.13.0) + json + diff-lcs (1.3) + json (2.0.3) + launchy (2.4.3) + addressable (~> 2.3) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + nokogiri (1.7.0.1) + mini_portile2 (~> 2.1.0) + public_suffix (2.0.5) + rack (2.0.1) + rack-test (0.6.3) + rack (>= 1.0) + rake (12.0.0) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) + xpath (2.0.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + capybara (~> 2.12.1) + capybara-screenshot (~> 1.0.14) + capybara-webkit (~> 1.12.0) + rake (~> 12.0.0) + rspec (~> 3.5) + +BUNDLED WITH + 1.14.6 |