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

Merge branch 's3-region' into 'master'
1eeb92a5 · Achilleas Pipinellis · 6b88cc64 · 978635f0 · 1eeb92a5
Commit 1eeb92a5 authored Sep 13, 2016 by Achilleas Pipinellis
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

container_registry.md doc/administration/container_registry.md +3 -1

No files found.
--- 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: