Commit 280ef2bf authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents df4b5268 6ee83f8c
...@@ -384,14 +384,12 @@ CAUTION: **Warning:** GitLab will not backup Docker images that are not stored o ...@@ -384,14 +384,12 @@ CAUTION: **Warning:** GitLab will not backup Docker images that are not stored o
filesystem. Remember to enable backups with your object storage provider if filesystem. Remember to enable backups with your object storage provider if
desired. desired.
--- NOTE: **Note:**
`regionendpoint` is only required when configuring an S3 compatible service such as Minio. It takes a URL such as `http://127.0.0.1:9000`.
**Omnibus GitLab installations** **Omnibus GitLab installations**
> **Note:** To configure the `s3` storage driver in Omnibus:
`regionendpoint` is only required when configuring an S3 compatible service such as Minio, by entering a URL such as http://127.0.0.1:9000
To configure the storage driver in Omnibus:
1. Edit `/etc/gitlab/gitlab.rb`: 1. Edit `/etc/gitlab/gitlab.rb`:
...@@ -409,16 +407,14 @@ To configure the storage driver in Omnibus: ...@@ -409,16 +407,14 @@ To configure the storage driver in Omnibus:
1. 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.
---
**Installations from source** **Installations from source**
Configuring the storage driver is done in your registry config YML file created Configuring the storage driver is done in your registry config YML file created
when you [deployed your docker registry][registry-deploy]. when you [deployed your docker registry][registry-deploy].
Example: `s3` storage driver example:
``` ```yml
storage: storage:
s3: s3:
accesskey: 'AKIAKIAKI' accesskey: 'AKIAKIAKI'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment