Revert "Merge pull request #437 from gdevillele/fix_keywords_format"

This reverts commit 13ddc1350ea1edafcb03d4db901823604a5d1ec1, reversing
changes made to 7a11f05943cc62d040dcfedc7621fdeafd11c718.
This commit is contained in:
Misty Stanley-Jones 2016-11-04 13:33:29 -07:00
parent 3d14741648
commit 8c922b0c8c
22 changed files with 70 additions and 50 deletions

View file

@ -1,6 +1,7 @@
--- ---
description: describes get by digest pitfall description: describes get by digest pitfall
keywords: registry, manifest, images, tags, repository, distribution, digest keywords:
- registry, manifest, images, tags, repository, distribution, digest
menu: menu:
main: main:
parent: smn_registry_ref parent: smn_registry_ref
@ -80,4 +81,4 @@ constraints of CAS.*
For this reason if a manifest is pulled by _digest_ from a registry 2.3 with Docker For this reason if a manifest is pulled by _digest_ from a registry 2.3 with Docker
Engine 1.9 and older, and the manifest was pushed with Docker Engine 1.10, a Engine 1.9 and older, and the manifest was pushed with Docker Engine 1.10, a
security check will cause the Engine to receive a manifest it cannot use and the security check will cause the Engine to receive a manifest it cannot use and the
pull will fail. pull will fail.

View file

@ -1,6 +1,7 @@
--- ---
description: Explains how to deploy a registry description: Explains how to deploy a registry
keywords: registry, on-prem, images, tags, repository, distribution, deployment keywords:
- registry, on-prem, images, tags, repository, distribution, deployment
menu: menu:
main: main:
parent: smn_registry parent: smn_registry
@ -233,4 +234,4 @@ You will find more specific and advanced informations in the following sections:
- [Advanced "recipes"](recipes/index.md) - [Advanced "recipes"](recipes/index.md)
- [Registry API](spec/api.md) - [Registry API](spec/api.md)
- [Storage driver model](storage-drivers/index.md) - [Storage driver model](storage-drivers/index.md)
- [Token authentication](spec/auth/token.md) - [Token authentication](spec/auth/token.md)

View file

@ -1,6 +1,7 @@
--- ---
description: describes deprecated functionality description: describes deprecated functionality
keywords: registry, manifest, images, signatures, repository, distribution, digest keywords:
- registry, manifest, images, signatures, repository, distribution, digest
menu: menu:
main: main:
parent: smn_registry_ref parent: smn_registry_ref
@ -23,4 +24,4 @@ not stored in the registry. This does not alter the functional behavior of
the registry. the registry.
Old signatures blobs can be removed from the registry storage by running the Old signatures blobs can be removed from the registry storage by running the
garbage-collect subcommand. garbage-collect subcommand.

View file

@ -1,6 +1,7 @@
--- ---
description: High level discussion of garbage collection description: High level discussion of garbage collection
keywords: registry, garbage, images, tags, repository, distribution keywords:
- registry, garbage, images, tags, repository, distribution
menu: menu:
main: main:
parent: smn_registry_ref parent: smn_registry_ref
@ -132,4 +133,5 @@ blob eligible for deletion: sha256:7e15ce58ccb2181a8fced7709e9893206f0937cc9543b
blob eligible for deletion: sha256:87192bdbe00f8f2a62527f36bb4c7c7f4eaf9307e4b87e8334fb6abec1765bcb blob eligible for deletion: sha256:87192bdbe00f8f2a62527f36bb4c7c7f4eaf9307e4b87e8334fb6abec1765bcb
blob eligible for deletion: sha256:b549a9959a664038fc35c155a95742cf12297672ca0ae35735ec027d55bf4e97 blob eligible for deletion: sha256:b549a9959a664038fc35c155a95742cf12297672ca0ae35735ec027d55bf4e97
blob eligible for deletion: sha256:f251d679a7c61455f06d793e43c06786d7766c88b8c24edf242b2c08e3c3f599 blob eligible for deletion: sha256:f251d679a7c61455f06d793e43c06786d7766c88b8c24edf242b2c08e3c3f599
``` ```

View file

@ -1,6 +1,7 @@
--- ---
description: Getting help with the Registry description: Getting help with the Registry
keywords: registry, on-prem, images, tags, repository, distribution, help, 101, TL;DR keywords:
- registry, on-prem, images, tags, repository, distribution, help, 101, TL;DR
menu: menu:
main: main:
parent: smn_registry parent: smn_registry
@ -20,4 +21,4 @@ If you want to report a bug:
- be sure to first read about [how to contribute](https://github.com/docker/distribution/blob/master/CONTRIBUTING.md) - be sure to first read about [how to contribute](https://github.com/docker/distribution/blob/master/CONTRIBUTING.md)
- you can then do so on the [GitHub project bugtracker](https://github.com/docker/distribution/issues) - you can then do so on the [GitHub project bugtracker](https://github.com/docker/distribution/issues)
You can also find out more about the Docker's project [Getting Help resources](/opensource/get-help.md). You can also find out more about the Docker's project [Getting Help resources](/opensource/get-help.md).

View file

@ -2,7 +2,8 @@
aliases: aliases:
- /registry/overview/ - /registry/overview/
description: High-level overview of the Registry description: High-level overview of the Registry
keywords: registry, on-prem, images, tags, repository, distribution keywords:
- registry, on-prem, images, tags, repository, distribution
menu: menu:
main: main:
parent: smn_registry parent: smn_registry
@ -64,4 +65,4 @@ Now stop your registry and remove all data
## Next ## Next
You should now read the [detailed introduction about the registry](introduction.md), or jump directly to [deployment instructions](deploying.md). You should now read the [detailed introduction about the registry](introduction.md), or jump directly to [deployment instructions](deploying.md).

View file

@ -1,6 +1,7 @@
--- ---
description: Deploying a Registry in an insecure fashion description: Deploying a Registry in an insecure fashion
keywords: registry, on-prem, images, tags, repository, distribution, insecure keywords:
- registry, on-prem, images, tags, repository, distribution, insecure
menu: menu:
main: main:
parent: smn_registry_ref parent: smn_registry_ref
@ -110,4 +111,4 @@ update-ca-trust
$ update-ca-trust enable $ update-ca-trust enable
``` ```
Now restart docker (`service docker stop && service docker start`, or any other way you use to restart docker). Now restart docker (`service docker stop && service docker start`, or any other way you use to restart docker).

View file

@ -1,6 +1,7 @@
--- ---
description: Explains what the Registry is, basic use cases and requirements description: Explains what the Registry is, basic use cases and requirements
keywords: registry, on-prem, images, tags, repository, distribution, use cases, requirements keywords:
- registry, on-prem, images, tags, repository, distribution, use cases, requirements
menu: menu:
main: main:
parent: smn_registry parent: smn_registry
@ -51,4 +52,4 @@ Also, while just starting a registry is fairly easy, operating it in a productio
## Next ## Next
Dive into [deploying your registry](deploying.md) Dive into [deploying your registry](deploying.md)

View file

@ -1,7 +1,7 @@
--- ---
description: Explains how to work with registry notifications description: Explains how to work with registry notifications
keywords: registry, on-prem, images, tags, repository, distribution, notifications, keywords:
advanced - registry, on-prem, images, tags, repository, distribution, notifications, advanced
menu: menu:
main: main:
parent: smn_registry parent: smn_registry
@ -347,4 +347,4 @@ provide acceptable guarantees, adding a transactional `Sink` to the registry
is a possibility, although it may have an effect on request service time. is a possibility, although it may have an effect on request service time.
Please see the Please see the
[godoc](http://godoc.org/github.com/docker/distribution/notifications#Sink) [godoc](http://godoc.org/github.com/docker/distribution/notifications#Sink)
for more information. for more information.

View file

@ -1,7 +1,8 @@
--- ---
description: Restricting access to your registry using an apache proxy description: Restricting access to your registry using an apache proxy
keywords: registry, on-prem, images, tags, repository, distribution, authentication, keywords:
proxy, apache, httpd, TLS, recipe, advanced - registry, on-prem, images, tags, repository, distribution, authentication, proxy,
apache, httpd, TLS, recipe, advanced
menu: menu:
main: main:
parent: smn_recipes parent: smn_recipes
@ -212,4 +213,4 @@ Now, login with a "pull-only" user (using `testuser` and `testpassword`), then p
Verify that the "pull-only" can NOT push: Verify that the "pull-only" can NOT push:
docker push myregistrydomain.com:5043/test docker push myregistrydomain.com:5043/test

View file

@ -1,6 +1,7 @@
--- ---
description: Fun stuff to do with your registry description: Fun stuff to do with your registry
keywords: registry, on-prem, images, tags, repository, distribution, recipes, advanced keywords:
- registry, on-prem, images, tags, repository, distribution, recipes, advanced
menu: menu:
main: main:
parent: smn_recipes parent: smn_recipes
@ -33,4 +34,4 @@ At this point, it's assumed that:
* [using Apache as an authenticating proxy](apache.md) * [using Apache as an authenticating proxy](apache.md)
* [using Nginx as an authenticating proxy](nginx.md) * [using Nginx as an authenticating proxy](nginx.md)
* [running a Registry on macOS](osx-setup-guide.md) * [running a Registry on macOS](osx-setup-guide.md)
* [mirror the Docker Hub](mirror.md) * [mirror the Docker Hub](mirror.md)

View file

@ -1,7 +1,8 @@
--- ---
description: Setting-up a local mirror for Docker Hub images description: Setting-up a local mirror for Docker Hub images
keywords: registry, on-prem, images, tags, repository, distribution, mirror, Hub, keywords:
recipe, advanced - registry, on-prem, images, tags, repository, distribution, mirror, Hub, recipe,
advanced
menu: menu:
main: main:
parent: smn_recipes parent: smn_recipes
@ -73,4 +74,4 @@ For example, if your mirror is serving on `http://10.0.0.2:5000`, you would run:
docker --registry-mirror=https://10.0.0.2:5000 daemon docker --registry-mirror=https://10.0.0.2:5000 daemon
NOTE: Depending on your local host setup, you may be able to add the `--registry-mirror` option to the `DOCKER_OPTS` variable in `/etc/default/docker`. NOTE: Depending on your local host setup, you may be able to add the `--registry-mirror` option to the `DOCKER_OPTS` variable in `/etc/default/docker`.

View file

@ -1,7 +1,8 @@
--- ---
description: Restricting access to your registry using a nginx proxy description: Restricting access to your registry using a nginx proxy
keywords: registry, on-prem, images, tags, repository, distribution, nginx, proxy, keywords:
authentication, TLS, recipe, advanced - registry, on-prem, images, tags, repository, distribution, nginx, proxy, authentication,
TLS, recipe, advanced
menu: menu:
main: main:
parent: smn_recipes parent: smn_recipes
@ -187,4 +188,4 @@ Login with a "push" authorized user (using `testuser` and `testpassword`), then
docker login -u=testuser -p=testpassword -e=root@example.ch myregistrydomain.com:5043 docker login -u=testuser -p=testpassword -e=root@example.ch myregistrydomain.com:5043
docker tag ubuntu myregistrydomain.com:5043/test docker tag ubuntu myregistrydomain.com:5043/test
docker push myregistrydomain.com:5043/test docker push myregistrydomain.com:5043/test
docker pull myregistrydomain.com:5043/test docker pull myregistrydomain.com:5043/test

View file

@ -1,7 +1,7 @@
--- ---
description: Explains how to run a registry on macOS description: Explains how to run a registry on macOS
keywords: registry, on-prem, images, tags, repository, distribution, macOS, recipe, keywords:
advanced - registry, on-prem, images, tags, repository, distribution, macOS, recipe, advanced
menu: menu:
main: main:
parent: smn_recipes parent: smn_recipes
@ -78,4 +78,4 @@ Start the Docker registry:
### Unloading the docker registry service ### Unloading the docker registry service
launchctl unload ~/Library/LaunchAgents/com.docker.registry.plist launchctl unload ~/Library/LaunchAgents/com.docker.registry.plist

View file

@ -1,6 +1,7 @@
--- ---
description: Explains how to use the Azure storage drivers description: Explains how to use the Azure storage drivers
keywords: registry, service, driver, images, storage, azure keywords:
- registry, service, driver, images, storage, azure
menu: menu:
main: main:
parent: smn_storagedrivers parent: smn_storagedrivers
@ -73,4 +74,4 @@ An implementation of the `storagedriver.StorageDriver` interface which uses [Mic
* To get information about * To get information about
[azure-blob-storage](http://azure.microsoft.com/en-us/services/storage/) visit [azure-blob-storage](http://azure.microsoft.com/en-us/services/storage/) visit
the Microsoft website. the Microsoft website.
* You can use Microsoft's [Blob Service REST API](https://msdn.microsoft.com/en-us/library/azure/dd135733.aspx) to [create a container] (https://msdn.microsoft.com/en-us/library/azure/dd179468.aspx). * You can use Microsoft's [Blob Service REST API](https://msdn.microsoft.com/en-us/library/azure/dd135733.aspx) to [create a container] (https://msdn.microsoft.com/en-us/library/azure/dd179468.aspx).

View file

@ -1,6 +1,7 @@
--- ---
description: Explains how to use the filesystem storage drivers description: Explains how to use the filesystem storage drivers
keywords: registry, service, driver, images, storage, filesystem keywords:
- registry, service, driver, images, storage, filesystem
menu: menu:
main: main:
parent: smn_storagedrivers parent: smn_storagedrivers
@ -19,4 +20,4 @@ there is adequate space available. Defaults to `/var/lib/registry`.
`maxthreads`: (optional) The maximum number of simultaneous blocking filesystem `maxthreads`: (optional) The maximum number of simultaneous blocking filesystem
operations permitted within the registry. Each operation spawns a new thread and operations permitted within the registry. Each operation spawns a new thread and
may cause thread exhaustion issues if many are done in parallel. Defaults to may cause thread exhaustion issues if many are done in parallel. Defaults to
`100`, and can be no lower than `25`. `100`, and can be no lower than `25`.

View file

@ -1,6 +1,7 @@
--- ---
description: Explains how to use the Google Cloud Storage drivers description: Explains how to use the Google Cloud Storage drivers
keywords: registry, service, driver, images, storage, gcs, google, cloud keywords:
- registry, service, driver, images, storage, gcs, google, cloud
menu: menu:
main: main:
parent: smn_storagedrivers parent: smn_storagedrivers
@ -73,4 +74,4 @@ An implementation of the `storagedriver.StorageDriver` interface which uses Goog
**Note** Instead of a key file you can use [Google Application Default Credentials](https://developers.google.com/identity/protocols/application-default-credentials). **Note** Instead of a key file you can use [Google Application Default Credentials](https://developers.google.com/identity/protocols/application-default-credentials).
`rootdirectory`: (optional) The root directory tree in which all registry files will be stored. Defaults to the empty string (bucket root). `rootdirectory`: (optional) The root directory tree in which all registry files will be stored. Defaults to the empty string (bucket root).

View file

@ -2,8 +2,8 @@
aliases: aliases:
- /registry/storagedrivers/ - /registry/storagedrivers/
description: Explains how to use storage drivers description: Explains how to use storage drivers
keywords: registry, on-prem, images, tags, repository, distribution, storage drivers, keywords:
advanced - registry, on-prem, images, tags, repository, distribution, storage drivers, advanced
menu: menu:
main: main:
identifier: storage_index identifier: storage_index
@ -63,4 +63,4 @@ Storage drivers should call `factory.Register` with their driver name in an `ini
Storage driver test suites are provided in Storage driver test suites are provided in
`storagedriver/testsuites/testsuites.go` and may be used for any storage `storagedriver/testsuites/testsuites.go` and may be used for any storage
driver written in Go. Tests can be registered using the `RegisterSuite` driver written in Go. Tests can be registered using the `RegisterSuite`
function, which run the same set of tests for any registered drivers. function, which run the same set of tests for any registered drivers.

View file

@ -1,6 +1,7 @@
--- ---
description: Explains how to use the in-memory storage drivers description: Explains how to use the in-memory storage drivers
keywords: registry, service, driver, images, storage, in-memory keywords:
- registry, service, driver, images, storage, in-memory
menu: menu:
main: main:
parent: smn_storagedrivers parent: smn_storagedrivers
@ -18,4 +19,4 @@ volatile memory, use the [`filesystem` driver](filesystem.md) on a ramdisk.
## Parameters ## Parameters
None None

View file

@ -1,6 +1,7 @@
--- ---
description: Explains how to use the Aliyun OSS storage driver description: Explains how to use the Aliyun OSS storage driver
keywords: registry, service, driver, images, storage, OSS, aliyun keywords:
- registry, service, driver, images, storage, OSS, aliyun
menu: menu:
main: main:
parent: smn_storagedrivers parent: smn_storagedrivers
@ -122,4 +123,4 @@ no
<td> The root directory tree in which to store all registry files. Defaults to an empty string (bucket root). <td> The root directory tree in which to store all registry files. Defaults to an empty string (bucket root).
</td> </td>
</tr> </tr>
</table> </table>

View file

@ -1,6 +1,7 @@
--- ---
description: Explains how to use the S3 storage drivers description: Explains how to use the S3 storage drivers
keywords: registry, service, driver, images, storage, S3 keywords:
- registry, service, driver, images, storage, S3
menu: menu:
main: main:
parent: smn_storagedrivers parent: smn_storagedrivers
@ -264,4 +265,4 @@ middleware:
## CloudFront Key-Pair ## CloudFront Key-Pair
A CloudFront key-pair is required for all AWS accounts needing access to your CloudFront distribution. For information, please see [Creating CloudFront Key Pairs](http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/private-content-trusted-signers.html#private-content-creating-cloudfront-key-pairs). A CloudFront key-pair is required for all AWS accounts needing access to your CloudFront distribution. For information, please see [Creating CloudFront Key Pairs](http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/private-content-trusted-signers.html#private-content-creating-cloudfront-key-pairs).

View file

@ -1,6 +1,7 @@
--- ---
description: Explains how to use the OpenStack swift storage driver description: Explains how to use the OpenStack swift storage driver
keywords: registry, service, driver, images, storage, swift keywords:
- registry, service, driver, images, storage, swift
menu: menu:
main: main:
parent: smn_storagedrivers parent: smn_storagedrivers
@ -241,4 +242,4 @@ disabled that feature, the configuration file can specify the following optional
</p> </p>
</td> </td>
</tr> </tr>
</table> </table>