Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'doc/install/installation.md')
-rw-r--r--doc/install/installation.md53
1 files changed, 38 insertions, 15 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 8497b2b5269..eb8c3784cfa 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -131,22 +131,45 @@ that:
- Is always at the version required by GitLab.
- May contain custom patches required for proper operation.
-```shell
-# Install dependencies
-sudo apt-get install -y libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev libpcre2-dev build-essential
+1. Install the needed dependencies:
-# Clone the Gitaly repository
-git clone https://gitlab.com/gitlab-org/gitaly.git -b <X-Y-stable> /tmp/gitaly
+ ```shell
+ sudo apt-get install -y libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev libpcre2-dev build-essential git-core
+ ```
-# Compile and install Git
-cd /tmp/gitaly
-sudo make git GIT_PREFIX=/usr/local
-```
+1. Clone the Gitaly repository and compile Git. Replace `<X-Y-stable>` with the
+ stable branch that matches the GitLab version you want to install. For example,
+ if you want to install GitLab 13.6, use the branch name `13-6-stable`:
+
+ ```shell
+ git clone https://gitlab.com/gitlab-org/gitaly.git -b <X-Y-stable> /tmp/gitaly
+ cd /tmp/gitaly
+ sudo make git GIT_PREFIX=/usr/local
+ ```
+
+1. Optionally, you can remove the system Git and its dependencies:
+
+ ```shell
+ sudo apt remove -y git-core
+ sudo apt autoremove
+ ```
+
+When [editing `config/gitlab.yml` later](#configure-it), remember to change
+the Git path:
+
+- From:
+
+ ```yaml
+ git:
+ bin_path: /usr/bin/git
+ ```
-Replace `<X-Y-stable>` with the stable branch that matches the GitLab version you want to
-install. For example, if you want to install GitLab 13.6, use the branch name `13-6-stable`.
+- To:
-When editing `config/gitlab.yml` later, change the `git -> bin_path` to `/usr/local/bin/git`.
+ ```yaml
+ git:
+ bin_path: /usr/local/bin/git
+ ```
### GraphicsMagick
@@ -212,7 +235,7 @@ curl --remote-name --progress-bar "https://cache.ruby-lang.org/pub/ruby/2.7/ruby
echo 'cb9731a17487e0ad84037490a6baf8bfa31a09e8 ruby-2.7.2.tar.gz' | shasum -c - && tar xzf ruby-2.7.2.tar.gz
cd ruby-2.7.2
-./configure --disable-install-rdoc
+./configure --disable-install-rdoc --enable-shared
make
sudo make install
```
@@ -570,8 +593,8 @@ Install the gems (if you want to use Kerberos for user authentication, omit
`kerberos` in the `--without` option below):
```shell
-sudo -u git -H bundle config set deployment 'true'
-sudo -u git -H bundle config set without 'development test mysql aws kerberos'
+sudo -u git -H bundle config set --local deployment 'true'
+sudo -u git -H bundle config set --local without 'development test mysql aws kerberos'
sudo -u git -H bundle install
```