Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

Documentation: update references to the Docker Hub #2528

Merged
merged 1 commit into from Apr 28, 2016
Merged

Documentation: update references to the Docker Hub #2528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions Documentation/configuration.md
View file
Open in desktop
Expand Up @@ -192,7 +192,7 @@ These fields must be specified and cannot be empty.

Some popular Docker registries:

* index.docker.io (Assumed as the default when no specific registry is named on the rkt command line, as in `docker:///redis`.)
* registry-1.docker.io (Assumed as the default when no specific registry is named on the rkt command line, as in `docker:///redis`.)
* quay.io
* gcr.io

Expand All @@ -204,7 +204,7 @@ Example `dockerAuth` configuration:
{
"rktKind": "dockerAuth",
"rktVersion": "v1",
"registries": ["index.docker.io", "quay.io"],
"registries": ["registry-1.docker.io", "quay.io"],
"credentials": {
"user": "foo",
"password": "bar"
Expand All @@ -224,15 +224,15 @@ For example, given this system configuration:
{
"rktKind": "dockerAuth",
"rktVersion": "v1",
"registries": ["index.docker.io", "gcr.io", "quay.io"],
"registries": ["registry-1.docker.io", "gcr.io", "quay.io"],
"credentials": {
"user": "foo",
"password": "bar"
}
}
```

If only this configuration file is provided, then when downloading images from either `index.docker.io`, `gcr.io`, or `quay.io`, `rkt` would use user `foo` and password `bar`.
If only this configuration file is provided, then when downloading images from either `registry-1.docker.io`, `gcr.io`, or `quay.io`, `rkt` would use user `foo` and password `bar`.

But with additional configuration provided in the local configuration directory, this can be overridden.
For example, given the above system configuration and the following local configuration:
Expand Down Expand Up @@ -265,7 +265,7 @@ For example, given the above system configuration and the following local config
}
```

The result is that when downloading images from `index.docker.io`, `rkt` still sends user `foo` and password `bar`, but when downloading from `quay.io`, it uses user `baz` and password `quux`; and for `gcr.io` it will use user `goo` and password `gle`.
The result is that when downloading images from `registry-1.docker.io`, `rkt` still sends user `foo` and password `bar`, but when downloading from `quay.io`, it uses user `baz` and password `quux`; and for `gcr.io` it will use user `goo` and password `gle`.

Note that _within_ a particular configuration directory (either system or local), it is a syntax error for the same Docker registry to be defined in multiple files.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/running-docker-images.md
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@ Downloading layer: f2fb89b0a711a7178528c7785d247ba3572924353b0d5e23e9b28f0518253
4:M 19 Apr 06:09:02.375 * The server is now ready to accept connections on port 6379
```

This behaves similarly to the Docker client: if no specific registry is named, the [Docker Hub](https://index.docker.io/v1/) is used by default.
This behaves similarly to the Docker client: if no specific registry is named, the [Docker Hub](https://hub.docker.com) is used by default.

As with Docker, alternative registries can be used by specifying the registry as part of the image reference.
For example, the following command will fetch an nginx Docker image hosted on quay.io:
Expand Down