From 7649278ba2ae9c597d4d6d2bc668bdb6920f4cbf Mon Sep 17 00:00:00 2001 From: Katrin Leinweber <724395-katrinleinweber@users.noreply.gitlab.com> Date: Mon, 27 Apr 2020 14:34:48 +0000 Subject: [PATCH] Docs: Prefer Ubuntu's Git-PPA over source compiling --- doc/install/installation.md | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/doc/install/installation.md b/doc/install/installation.md index 3652b31c1aa2..27616f6c1ff3 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -142,21 +142,31 @@ Starting with GitLab 12.0, Git is required to be compiled with `libpcre2`. Find out if that's the case: ```shell -ldd /usr/local/bin/git | grep pcre2 +ldd $(which git) | grep pcre2 ``` -The output should be similar to: +The output should contain `libpcre2-8.so.0`. -```plaintext -libpcre2-8.so.0 => /usr/lib/libpcre2-8.so.0 (0x00007f08461c3000) +Is the system packaged Git too old, or not compiled with pcre2? +Remove it: + +```shell +sudo apt-get remove git-core ``` -Is the system packaged Git too old, or not compiled with pcre2? Remove it and compile from source: +On Ubuntu, install Git from [its official PPA](https://git-scm.com/download/linux): ```shell -# Remove packaged Git -sudo apt-get remove git-core +# run as root! +add-apt-repository ppa:git-core/ppa +apt update +apt install git +# repeat libpcre2 check as above +``` +On Debian, use the following compilation instructions: + +```shell # Install dependencies sudo apt-get install -y libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev build-essential @@ -180,7 +190,7 @@ make prefix=/usr/local all # Install into /usr/local/bin sudo make prefix=/usr/local install -# When editing config/gitlab.yml (Step 5), change the git -> bin_path to /usr/local/bin/git +# When editing config/gitlab.yml later, change the git -> bin_path to /usr/local/bin/git ``` For the [Custom Favicon](../user/admin_area/appearance.md#favicon) to work, GraphicsMagick