diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-13 10:32:54 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-13 10:32:54 +0300 |
| commit | 1eeb92a5a5fce62edd0952c514502d0673e8ee32 (patch) | |
| tree | cb25987d68c36c8dc7ad40c385cbe38a4f821918 | |
| parent | 6b88cc6469a08db12aee8f5b0f8ef581bd491265 (diff) | |
| parent | 978635f0830aca5da05b68b8e325ba50ad9ff3ee (diff) | |
Merge branch 's3-region' into 'master'
Include region in S3 configuration
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5336
See merge request !5896
| -rw-r--r-- | doc/administration/container_registry.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md index 28c4c7c86ca..c5611e2a121 100644 --- a/doc/administration/container_registry.md +++ b/doc/administration/container_registry.md @@ -406,7 +406,8 @@ To configure the storage driver in Omnibus: 's3' => { 'accesskey' => 's3-access-key', 'secretkey' => 's3-secret-key-for-access-key', - 'bucket' => 'your-s3-bucket' + 'bucket' => 'your-s3-bucket', + 'region' => 'your-s3-region' } } ``` @@ -428,6 +429,7 @@ storage: accesskey: 'AKIAKIAKI' secretkey: 'secret123' bucket: 'gitlab-registry-bucket-AKIAKIAKI' + region: 'your-s3-region' cache: blobdescriptor: inmemory delete: |