diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-01-15 15:15:21 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-01-15 15:15:21 +0300 |
| commit | d0dd477ff01b3cef93652d21ec6ca5a958d5a08d (patch) | |
| tree | 60abbc883ea6fae8fd01f4e72ecde7d6d799be58 | |
| parent | 9a9cdf0a717b45f0fb4eba415cae48bdeefa647a (diff) | |
| parent | bc6913de657e9ff76fcb4c88bb71d5a3b9e065cd (diff) | |
Merge branch 'fix-gemfile-docker-path' into 'master'
Fix path to Gemfile in build image Dockerfile
See merge request gitlab-org/gitaly!531
| -rw-r--r-- | _support/build-images/versioned/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/_support/build-images/versioned/Dockerfile b/_support/build-images/versioned/Dockerfile index 856f92aa5..7b4c278ad 100644 --- a/_support/build-images/versioned/Dockerfile +++ b/_support/build-images/versioned/Dockerfile @@ -3,8 +3,8 @@ FROM registry.gitlab.com/gitlab-org/gitlab-build-images:${CUSTOM_IMAGE_VERSION} RUN mkdir -p /bundle-cache -COPY Gemfile /bundle-cache -COPY Gemfile.lock /bundle-cache +COPY ./ruby/Gemfile /bundle-cache +COPY ./ruby/Gemfile.lock /bundle-cache RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install -qq -y rubygems bundler cmake build-essential libicu-dev && \ |