Commit e30a4f77 authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'rhassanein-s3-NoSubdirectoriesInBucket' into 'master'

Docs: S3 bucket can't include subdirectories

See merge request gitlab-org/gitlab!22268
parents dd78dc0a 1a35a3db
...@@ -398,6 +398,9 @@ To configure the `s3` storage driver in Omnibus: ...@@ -398,6 +398,9 @@ To configure the `s3` storage driver in Omnibus:
1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect. 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
NOTE: **Note:**
`your-s3-bucket` should only be the name of a bucket that exists, and can't include subdirectories.
**Installations from source** **Installations from source**
Configuring the storage driver is done in your registry config YML file created Configuring the storage driver is done in your registry config YML file created
...@@ -408,9 +411,9 @@ when you [deployed your docker registry](https://docs.docker.com/registry/deploy ...@@ -408,9 +411,9 @@ when you [deployed your docker registry](https://docs.docker.com/registry/deploy
```yml ```yml
storage: storage:
s3: s3:
accesskey: 'AKIAKIAKI' accesskey: 's3-access-key'
secretkey: 'secret123' secretkey: 's3-secret-key-for-access-key'
bucket: 'gitlab-registry-bucket-AKIAKIAKI' bucket: 'your-s3-bucket'
region: 'your-s3-region' region: 'your-s3-region'
regionendpoint: 'your-s3-regionendpoint' regionendpoint: 'your-s3-regionendpoint'
cache: cache:
...@@ -419,6 +422,9 @@ storage: ...@@ -419,6 +422,9 @@ storage:
enabled: true enabled: true
``` ```
NOTE: **Note:**
`your-s3-bucket` should only be the name of a bucket that exists, and can't include subdirectories.
## Change the registry's internal port ## Change the registry's internal port
NOTE: **Note:** NOTE: **Note:**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment