Merge pull request #448 from moxiegirl/fix-release-branch

Fix release branch
This commit is contained in:
Stephen Day 2015-04-28 10:35:52 -07:00
commit 560a10e6ac
4 changed files with 19 additions and 7 deletions

View file

@ -26,6 +26,9 @@ server {
return 404; return 404;
} }
# The docker client expects this header from the /v2/ endpoint.
more_set_headers 'Docker-Distribution-Api-Version: registry/2.0';
include docker-registry-v2.conf; include docker-registry-v2.conf;
} }

View file

@ -9,6 +9,18 @@ You configure a registry server using a YAML file. This page explains the
configuration options and the values they can take. You'll also find examples of configuration options and the values they can take. You'll also find examples of
middleware and development environment configurations. middleware and development environment configurations.
## Overriding configuration options
Environment variables may be used to override configuration parameters other than
version. To override a configuration option, create an environment variable named
REGISTRY\_variable_ where *variable* is the name of the configuration option.
e.g
```
REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/tmp/registry/test
```
will set the storage root directory to `/tmp/registry/test`
## List of configuration options ## List of configuration options
This section lists all the registry configuration options. Some options in This section lists all the registry configuration options. Some options in

View file

@ -7,10 +7,7 @@
- ['registry/spec/json.md', 'Reference', '    ▪  JSON format' ] - ['registry/spec/json.md', 'Reference', '    ▪  JSON format' ]
- ['registry/spec/auth/token.md', 'Reference', '    ▪  Authenticate via central service' ] - ['registry/spec/auth/token.md', 'Reference', '    ▪  Authenticate via central service' ]
<<<<<<< HEAD
=======
- ['registry/storage-drivers/azure.md', '**HIDDEN**' ] - ['registry/storage-drivers/azure.md', '**HIDDEN**' ]
- ['registry/storage-drivers/filesystem.md', '**HIDDEN**' ] - ['registry/storage-drivers/filesystem.md', '**HIDDEN**' ]
- ['registry/storage-drivers/inmemory.md', '**HIDDEN**' ] - ['registry/storage-drivers/inmemory.md', '**HIDDEN**' ]
- ['registry/storage-drivers/s3.md','**HIDDEN**' ] - ['registry/storage-drivers/s3.md','**HIDDEN**' ]
>>>>>>> d5c0300... Pushing fix for mkdocs.yml introduced

View file

@ -8,10 +8,10 @@ Provided Drivers
This storage driver package comes bundled with several drivers: This storage driver package comes bundled with several drivers:
- [inmemory](storage-drivers/inmemory): A temporary storage driver using a local inmemory map. This exists solely for reference and testing. - [inmemory](storage-drivers/inmemory.md): A temporary storage driver using a local inmemory map. This exists solely for reference and testing.
- [filesystem](storage-drivers/filesystem): A local storage driver configured to use a directory tree in the local filesystem. - [filesystem](storage-drivers/filesystem.md): A local storage driver configured to use a directory tree in the local filesystem.
- [s3](storage-drivers/s3): A driver storing objects in an Amazon Simple Storage Solution (S3) bucket. - [s3](storage-drivers/s3.md): A driver storing objects in an Amazon Simple Storage Solution (S3) bucket.
- [azure](storage-drivers/azure): A driver storing objects in [Microsoft Azure Blob Storage](http://azure.microsoft.com/en-us/services/storage/). - [azure](storage-drivers/azure.md): A driver storing objects in [Microsoft Azure Blob Storage](http://azure.microsoft.com/en-us/services/storage/).
Storage Driver API Storage Driver API
================== ==================