summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-05-01 00:00:34 +0000
committerEvan Read <eread@gitlab.com>2019-05-01 00:00:34 +0000
commit49607217cfa14d1f70bb636b1923874dddc0a390 (patch)
treed406049cf4475d2cf4d3c9556e2cb83324880af7
parent296a7fed89b3f7c25a3e458510708756bbc09276 (diff)
parent0e3d745fff0bf87990691186a9b61762f9ceec19 (diff)
downloadgitlab-ce-49607217cfa14d1f70bb636b1923874dddc0a390.tar.gz
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
-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 05beb724d4d..48f599fa7e6 100644
--- a/doc/administration/container_registry.md
+++ b/doc/administration/container_registry.md
@@ -388,6 +388,9 @@ desired.
**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:
1. Edit `/etc/gitlab/gitlab.rb`:
@@ -398,7 +401,8 @@ To configure the storage driver in Omnibus:
'accesskey' => 's3-access-key',
'secretkey' => 's3-secret-key-for-access-key',
'bucket' => 'your-s3-bucket',
- 'region' => 'your-s3-region'
+ 'region' => 'your-s3-region',
+ 'regionendpoint' => 'your-s3-regionendpoint'
}
}
```
@@ -421,6 +425,7 @@ storage:
secretkey: 'secret123'
bucket: 'gitlab-registry-bucket-AKIAKIAKI'
region: 'your-s3-region'
+ regionendpoint: 'your-s3-regionendpoint'
cache:
blobdescriptor: inmemory
delete: