diff options
| author | John Cai <jcai@gitlab.com> | 2019-07-06 03:19:21 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-07-06 03:19:21 +0300 |
| commit | cbdd69b4ec5c0a3dcac6a717608c0d6c3ddeb6ef (patch) | |
| tree | eb6b8e0eb0abcdb4b85b72a713e78c1d1fd3631f | |
| parent | bf1d9c3b9e5bbdfa3076ae500b45a20343e961eb (diff) | |
| parent | d9845d9413a43cb1a940dda61b210ede6f32e53c (diff) | |
Merge branch 'zj-dockerfile-minor-update' into 'master'
Update Git version and remove GitLab-Shell clone
See merge request gitlab-org/gitaly!1351
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Dockerfile b/Dockerfile index 56ac98b8d..b2976948a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,13 @@ - -# # This will create a docker image for Gitaly that is suitable for testing, but # is not expected to be used in a production environment, yet. # # See the _support/load-cluster/docker-compose.yml for an example of how to use # this image # -FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.11-git-2.18 +FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.11-git-2.21 RUN mkdir -p /app/ruby -RUN git clone https://gitlab.com/gitlab-org/gitlab-shell.git /app/gitlab-shell - COPY ./ruby/Gemfile /app/ruby/ COPY ./ruby/Gemfile.lock /app/ruby/ |