summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytses@gmail.com>2014-12-02 19:25:04 +0100
committerSytse Sijbrandij <sytses@gmail.com>2014-12-02 19:25:04 +0100
commited7760b1d7b58d07793437db78f960ed7c4ae182 (patch)
tree8e6991ec4e19344a22e7df6c3bbdb543ad9731cb /docker
parent3b643bc87ba126e00550e6a067e4327020452a1b (diff)
downloadgitlab-ce-ed7760b1d7b58d07793437db78f960ed7c4ae182.tar.gz
Add command to limit Postgres memory allocation, thanks Jacob.user-agnostic-docker-example
Diffstat (limited to 'docker')
-rw-r--r--docker/troubleshooting.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/troubleshooting.md b/docker/troubleshooting.md
index deab144841c..442cc69ec58 100644
--- a/docker/troubleshooting.md
+++ b/docker/troubleshooting.md
@@ -40,7 +40,11 @@ sudo docker run -ti -e TERM=linux --name gitlab --publish 8080:80 --publish 2222
# Configure GitLab to redirect PostgreSQL logs
echo "postgresql['log_directory'] = '/var/log/gitlab/postgresql'" >> /etc/gitlab/gitlab.rb
+# Prevent Postgres from allocating 25% of total memory
+echo "postgresql['shared_buffers'] = '100MB'" >> /etc/gitlab/gitlab.rb
+
# You can now start GitLab manually from Bash (in the background)
+# Maybe the command below is still missing something to run in the background
gitlab-ctl reconfigure > /var/log/gitlab/reconfigure.log & /opt/gitlab/embedded/bin/runsvdir-start &
# And tail the logs (PostgreSQL log may not exist immediately)