Address inconsistencies when using git (packaged with gitaly).

This commit is contained in:
Steven Achilles 2022-05-03 17:58:58 +02:00
parent 8d05283a84
commit a02abdce2d
3 changed files with 3 additions and 3 deletions

View File

@ -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 \

View File

@ -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() {

View File

@ -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: