From a02abdce2d3ff11ca62d0733dd4c346a3e0a4d72 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 3 May 2022 17:58:58 +0200 Subject: [PATCH] Address inconsistencies when using git (packaged with gitaly). --- Dockerfile | 2 +- assets/build/install.sh | 2 +- assets/runtime/config/gitlabhq/gitlab.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b3b9c4db..49cb5929 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,7 +49,7 @@ RUN set -ex && \ libpq5 zlib1g libyaml-0-2 libssl1.1 \ libgdbm6 libreadline8 libncurses5 libffi7 \ libxml2 libxslt1.1 libcurl4 libicu66 libre2-dev tzdata unzip libimage-exiftool-perl \ - libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev libpcre2-dev build-essential git-core \ + libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev libpcre2-dev build-essential \ libmagic1 \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ diff --git a/assets/build/install.sh b/assets/build/install.sh index e2ab048e..c414596b 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -24,7 +24,7 @@ BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \ libpq-dev zlib1g-dev libyaml-dev libssl-dev \ libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \ libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev \ - gettext libkrb5-dev" + gettext libkrb5-dev git-core" ## Execute a command as GITLAB_USER exec_as_git() { diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index fb6b791c..a0c47891 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -1147,7 +1147,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: - bin_path: /usr/bin/git + bin_path: /usr/local/bin/git ## ActionCable settings action_cable: