kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 's3-region' into 'master'

Browse source 
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
This commit is contained in:
Achilleas Pipinellis 2016-09-13 07:32:54 +00:00
commit 1eeb92a5a5
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/administration/container_registry.md
View file

@ -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: