From d9845d9413a43cb1a940dda61b210ede6f32e53c Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Wed, 3 Jul 2019 14:14:22 +0200 Subject: Update Git version and remove GitLab-Shell clone Our Dockerfile is hardly used, but it does still hold value. This commit bumps the version of the Git package, to a supported version. Also removes the cloned version of GitLab-Shell, as the required parts are absorbed already now. --- Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'Dockerfile') 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/ -- cgit v1.2.3