summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chrisjwilson.com>2016-07-19 04:16:26 +0000
committerChris Wilson <chris@chrisjwilson.com>2016-07-19 04:16:26 +0000
commit81cf4a96e2595907433d53027a0bb157316c562a (patch)
tree5b90d3cad73a3f1e4f57cc802d25fe19c9f9cc64
parenta27212ab908d5161f5a75b27c4616c11f497f5d4 (diff)
downloadgitlab-ce-mrchrisw/docker-s3.tar.gz
Include required s3 region and disable redirectmrchrisw/docker-s3
-rw-r--r--doc/administration/container_registry.md7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/administration/container_registry.md b/doc/administration/container_registry.md
index d5d43303454..385cbd85779 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -403,7 +403,11 @@ 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'
+ },
+ 'redirect' => {
+ 'disable' => true
}
}
```
@@ -425,6 +429,7 @@ storage:
accesskey: 'AKIAKIAKI'
secretkey: 'secret123'
bucket: 'gitlab-registry-bucket-AKIAKIAKI'
+ region: 'your-s3-region'
cache:
blobdescriptor: inmemory
delete: