diff options
Diffstat (limited to 'doc/install/docker.md')
| -rw-r--r-- | doc/install/docker.md | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/doc/install/docker.md b/doc/install/docker.md index 00e19e2977b..2efe6a3640b 100644 --- a/doc/install/docker.md +++ b/doc/install/docker.md @@ -81,6 +81,7 @@ sudo docker run --detach \ --volume $GITLAB_HOME/config:/etc/gitlab \ --volume $GITLAB_HOME/logs:/var/log/gitlab \ --volume $GITLAB_HOME/data:/var/opt/gitlab \ + --shm-size 256m \ gitlab/gitlab-ee:latest ``` @@ -99,6 +100,7 @@ sudo docker run --detach \ --volume $GITLAB_HOME/config:/etc/gitlab:Z \ --volume $GITLAB_HOME/logs:/var/log/gitlab:Z \ --volume $GITLAB_HOME/data:/var/opt/gitlab:Z \ + --shm-size 256m \ gitlab/gitlab-ee:latest ``` @@ -155,6 +157,7 @@ install, and upgrade your Docker-based GitLab installation: - '$GITLAB_HOME/config:/etc/gitlab' - '$GITLAB_HOME/logs:/var/log/gitlab' - '$GITLAB_HOME/data:/var/opt/gitlab' + shm_size: '256m' ``` 1. Make sure you are in the same directory as `docker-compose.yml` and start @@ -188,6 +191,7 @@ web: - '$GITLAB_HOME/config:/etc/gitlab' - '$GITLAB_HOME/logs:/var/log/gitlab' - '$GITLAB_HOME/data:/var/opt/gitlab' + shm_size: '256m' ``` This is the same as using `--publish 8929:8929 --publish 2224:22`. @@ -199,11 +203,11 @@ configure and deploy your Docker-based GitLab installation in a swarm cluster. In swarm mode you can leverage [Docker secrets](https://docs.docker.com/engine/swarm/secrets/) -and [Docker configs](https://docs.docker.com/engine/swarm/configs/) to efficiently and securely deploy your GitLab instance. +and [Docker configurations](https://docs.docker.com/engine/swarm/configs/) to efficiently and securely deploy your GitLab instance. Secrets can be used to securely pass your initial root password without exposing it as an environment variable. -Configs can help you to keep your GitLab image as generic as possible. +Configurations can help you to keep your GitLab image as generic as possible. -Here's an example that deploys GitLab with four runners as a [stack](https://docs.docker.com/get-started/part5/), using secrets and configs: +Here's an example that deploys GitLab with four runners as a [stack](https://docs.docker.com/get-started/part5/), using secrets and configurations: 1. [Set up a Docker swarm](https://docs.docker.com/engine/swarm/swarm-tutorial/). 1. Create a `docker-compose.yml` file: @@ -221,6 +225,7 @@ Here's an example that deploys GitLab with four runners as a [stack](https://doc - $GITLAB_HOME/data:/var/opt/gitlab - $GITLAB_HOME/logs:/var/log/gitlab - $GITLAB_HOME/config:/etc/gitlab + shm_size: '256m' environment: GITLAB_OMNIBUS_CONFIG: "from_file('/omnibus_config.rb')" configs: @@ -325,6 +330,7 @@ sudo docker run --detach \ --volume $GITLAB_HOME/config:/etc/gitlab \ --volume $GITLAB_HOME/logs:/var/log/gitlab \ --volume $GITLAB_HOME/data:/var/opt/gitlab \ + --shm-size 256m \ gitlab/gitlab-ee:latest ``` @@ -361,6 +367,7 @@ sudo docker run --detach \ --volume $GITLAB_HOME/config:/etc/gitlab \ --volume $GITLAB_HOME/logs:/var/log/gitlab \ --volume $GITLAB_HOME/data:/var/opt/gitlab \ + --shm-size 256m \ gitlab/gitlab-ee:latest ``` @@ -388,6 +395,7 @@ port `2289`: --volume $GITLAB_HOME/config:/etc/gitlab \ --volume $GITLAB_HOME/logs:/var/log/gitlab \ --volume $GITLAB_HOME/data:/var/opt/gitlab \ + --shm-size 256m \ gitlab/gitlab-ee:latest ``` @@ -477,6 +485,7 @@ To update GitLab that was [installed using Docker Engine](#install-gitlab-using- --volume $GITLAB_HOME/config:/etc/gitlab \ --volume $GITLAB_HOME/logs:/var/log/gitlab \ --volume $GITLAB_HOME/data:/var/opt/gitlab \ + --shm-size 256m \ gitlab/gitlab-ee:latest ``` @@ -643,4 +652,4 @@ purpose. ### Docker containers exhausts space due to the `json-file` -Docker's [default logging driver is `json-file`](https://docs.docker.com/config/containers/logging/configure/#configure-the-default-logging-driver), which performs no log rotation by default. As a result of this lack of rotation, log files stored by the `json-file` driver can consume a significant amount of disk space for containers that generate a lot of output. This can lead to disk space exhaustion. To address this, use [journald](https://docs.docker.com/config/containers/logging/journald/) as the logging driver when available, or [another supported driver](https://docs.docker.com/config/containers/logging/configure/#supported-logging-drivers) with native rotation support. +Docker's [default logging driver is `json-file`](https://docs.docker.com/config/containers/logging/configure/#configure-the-default-logging-driver), which performs no log rotation by default. As a result of this lack of rotation, log files stored by the `json-file` driver can consume a significant amount of disk space for containers that generate a lot of output. This can lead to disk space exhaustion. To address this, use [`journald`](https://docs.docker.com/config/containers/logging/journald/) as the logging driver when available, or [another supported driver](https://docs.docker.com/config/containers/logging/configure/#supported-logging-drivers) with native rotation support. |