summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-05-22 19:31:19 -0500
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-05-22 19:34:52 -0500
commitf896a4e0c1cb66392e069556c1c298915fc55d0e (patch)
tree1e1a2f01785727dcfa12926055825a3c18642327
parentf55f62853162af86989a8343c6692c956f7ccbb0 (diff)
downloadgitlab-ce-f896a4e0c1cb66392e069556c1c298915fc55d0e.tar.gz
Refactor storage location section
-rw-r--r--doc/administration/container_registry.md58
1 files changed, 34 insertions, 24 deletions
diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index 7d7d5fd1e84..e9d850ca685 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -319,39 +319,49 @@ the Container Registry by themselves, follow the steps below.
## Container Registry storage path
-It is possible to change path where containers will be stored by the Container
-Registry.
+To change the storage path where Docker images will be stored, follow the
+steps below.
-**Omnibus GitLab packages**
+This path is accessible to:
+
+- the user running the Container Registry daemon,
+- the user running GitLab
+- and to the user running the Nginx web server.
+
+> **Warning** You should confirm that all GitLab, Registry and web server users
+have access to this directory.
---
-By default, the path Container Registry is using to store the containers is in
-`/var/opt/gitlab/gitlab-rails/shared/registry`.
-This path is accessible to the user running the Container Registry daemon,
-user running GitLab and to the user running Nginx web server.
+**Omnibus GitLab installations**
-In `/etc/gitlab/gitlab.rb`:
+The default location where images are stored in Omnibus, is
+`/var/opt/gitlab/gitlab-rails/shared/registry`. To change it:
-```ruby
-gitlab_rails['registry_path'] = "/path/to/registry/storage"
-```
+1. Edit `/etc/gitlab/gitlab.rb`:
-```
-registry:
- enabled: true
- host: registry.gitlab.example.com
- port: 5005
- api_url: http://localhost:5000/
- key_path: config/registry.key
- path: shared/registry
- issuer: gitlab-issuer
-```
+ ```ruby
+ gitlab_rails['registry_path'] = "/path/to/registry/storage"
+ ```
-Save the file and [reconfigure GitLab][] for the changes to take effect.
+1. Save the file and [reconfigure GitLab][] for the changes to take effect.
-**NOTE** You should confirm that the GitLab, registry and the web server user
-have access to this directory.
+---
+
+**Installations from source**
+
+The default location where images are stored in source installations, is
+`/home/git/gitlab/shared/registry`. To change it:
+
+1. Open `/home/git/gitlab/config/gitlab.yml`, find the `registry` entry and
+ change the `path` setting:
+
+ ```
+ registry:
+ path: shared/registry
+ ```
+
+1. Save the file and [restart GitLab][] for the changes to take effect.
## Storage limitations