Skip to content

Commit

Permalink
Merge branch 'doc-git-install-from-ppa' into 'master'
Browse files Browse the repository at this point in the history
Docs: Prefer Ubuntu's Git-PPA over source compiling

See merge request gitlab-org/gitlab!30382
  • Loading branch information
axilleas committed Apr 27, 2020
2 parents 04fe25d + 7649278 commit afc9724
Showing 1 changed file with 18 additions and 8 deletions.
26 changes: 18 additions & 8 deletions doc/install/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down

0 comments on commit afc9724

Please sign in to comment.