summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-05-13 21:24:05 +0000
committerEvan Read <eread@gitlab.com>2019-05-13 21:24:05 +0000
commit0a7216ab6eccf5607d5c526c1deea235f0f7462e (patch)
tree43d0639f3311cda76d4f7fed7a2dac6c7aee8919
parentdbc0f8c1d3275b8c07102c68055e7c58c335ebb8 (diff)
parent87ae67136ecb2294e8dde784b92a332bb0c06ec0 (diff)
downloadgitlab-ce-0a7216ab6eccf5607d5c526c1deea235f0f7462e.tar.gz
Merge branch 'docs/improve-installation-from-source' into 'master'
Improve installation from source Closes #47483, #61549, and #50937 See merge request gitlab-org/gitlab-ce!28201
-rw-r--r--doc/install/installation.md30
1 files changed, 30 insertions, 0 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md
index f16bc04af34..1fff3e92280 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -448,6 +448,18 @@ sudo -u git cp config/database.yml.postgresql config/database.yml
# MySQL only:
sudo -u git cp config/database.yml.mysql config/database.yml
+# PostgreSQL only:
+# Remove host, username, and password lines from config/database.yml.
+# Once modified, the `production` settings will be as follows:
+#
+# production:
+# adapter: postgresql
+# encoding: unicode
+# database: gitlabhq_production
+# pool: 10
+#
+sudo -u git -H editor config/database.yml
+
# MySQL and remote PostgreSQL only:
# Update username/password in config/database.yml.
# You only need to adapt the production settings (first part).
@@ -565,6 +577,18 @@ sudo -u git -H editor config.toml
For more information about configuring Gitaly see
[doc/administration/gitaly](../administration/gitaly).
+### Start Gitaly
+
+Gitaly must be running for the next section.
+
+```sh
+gitlab_path=/home/git/gitlab
+gitaly_path=/home/git/gitaly
+
+sudo -u git -H $gitlab_path/bin/daemon_with_pidfile $gitlab_path/tmp/pids/gitaly.pid \
+ $gitaly_path/gitaly $gitaly_path/config.toml >> $gitlab_path/log/gitaly.log 2>&1 &
+```
+
### Initialize Database and Activate Advanced Features
```sh
@@ -640,6 +664,12 @@ sudo -u git -H yarn install --production --pure-lockfile
sudo -u git -H bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production
```
+If `rake` fails with `JavaScript heap out of memory` error, try to run it with `NODE_OPTIONS` set as follows.
+
+```sh
+sudo -u git -H bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production NODE_OPTIONS="--max_old_space_size=4096"
+```
+
### Start Your GitLab Instance
```sh