Merge branch '57718-missing-supported-feature-in-registry-documentation' into 'master'

Add missing regionendpoint documentation.

Closes #57718

See merge request gitlab-org/gitlab-ce!25297
This commit is contained in:
Evan Read 2019-05-01 00:00:34 +00:00
commit 49607217cf

View file

@ -388,6 +388,9 @@ desired.
**Omnibus GitLab installations** **Omnibus GitLab installations**
> **Note:**
`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: To configure the storage driver in Omnibus:
1. Edit `/etc/gitlab/gitlab.rb`: 1. Edit `/etc/gitlab/gitlab.rb`:
@ -398,7 +401,8 @@ To configure the storage driver in Omnibus:
'accesskey' => 's3-access-key', 'accesskey' => 's3-access-key',
'secretkey' => 's3-secret-key-for-access-key', 'secretkey' => 's3-secret-key-for-access-key',
'bucket' => 'your-s3-bucket', 'bucket' => 'your-s3-bucket',
'region' => 'your-s3-region' 'region' => 'your-s3-region',
'regionendpoint' => 'your-s3-regionendpoint'
} }
} }
``` ```
@ -421,6 +425,7 @@ storage:
secretkey: 'secret123' secretkey: 'secret123'
bucket: 'gitlab-registry-bucket-AKIAKIAKI' bucket: 'gitlab-registry-bucket-AKIAKIAKI'
region: 'your-s3-region' region: 'your-s3-region'
regionendpoint: 'your-s3-regionendpoint'
cache: cache:
blobdescriptor: inmemory blobdescriptor: inmemory
delete: delete: