Merge pull request #6287 from jamtur01/userguide

Initial links
This commit is contained in:
James Turnbull 2014-06-08 14:57:40 -07:00
commit d87fdaa1e3
40 changed files with 205 additions and 198 deletions

View File

@ -51,19 +51,19 @@ pages:
# User Guide:
- ['userguide/index.md', 'User Guide', 'The Docker User Guide' ]
- ['userguide/dockerio.md', 'User Guide', 'Getting Started with Docker.io' ]
- ['userguide/dockerhub.md', 'User Guide', 'Getting Started with Docker Hub' ]
- ['userguide/dockerizing.md', 'User Guide', 'Dockerizing Applications' ]
- ['userguide/usingdocker.md', 'User Guide', 'Working with Containers' ]
- ['userguide/dockerimages.md', 'User Guide', 'Working with Docker Images' ]
- ['userguide/dockerlinks.md', 'User Guide', 'Linking containers together' ]
- ['userguide/dockervolumes.md', 'User Guide', 'Managing data in containers' ]
- ['userguide/dockerrepos.md', 'User Guide', 'Working with Docker.io' ]
- ['userguide/dockerrepos.md', 'User Guide', 'Working with Docker Hub' ]
# Docker.io docs:
- ['docker-io/index.md', 'Docker.io', 'Docker.io' ]
- ['docker-io/accounts.md', 'Docker.io', 'Accounts']
- ['docker-io/repos.md', 'Docker.io', 'Repositories']
- ['docker-io/builds.md', 'Docker.io', 'Automated Builds']
# Docker Hub docs:
- ['docker-hub/index.md', 'Docker Hub', 'Docker Hub' ]
- ['docker-hub/accounts.md', 'Docker Hub', 'Accounts']
- ['docker-hub/repos.md', 'Docker Hub', 'Repositories']
- ['docker-hub/builds.md', 'Docker Hub', 'Automated Builds']
# Examples:
- ['examples/index.md', '**HIDDEN**']
@ -99,7 +99,7 @@ pages:
- ['faq.md', 'Reference', 'FAQ']
- ['reference/run.md', 'Reference', 'Run Reference']
- ['reference/api/index.md', '**HIDDEN**']
- ['reference/api/docker-io_api.md', 'Reference', 'Docker.io API']
- ['reference/api/docker-io_api.md', 'Reference', 'Docker Hub API']
- ['reference/api/registry_api.md', 'Reference', 'Docker Registry API']
- ['reference/api/registry_index_spec.md', 'Reference', 'Registry & Index Spec']
- ['reference/api/docker_remote_api.md', 'Reference', 'Docker Remote API']

View File

@ -18,7 +18,9 @@
{ "Condition": { "KeyPrefixEquals": "use/working_with_links_names/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "userguide/dockerlinks/" } },
{ "Condition": { "KeyPrefixEquals": "use/workingwithrepository/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "userguide/dockerrepos/" } },
{ "Condition": { "KeyPrefixEquals": "use/port_redirection" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "userguide/dockerlinks/" } },
{ "Condition": { "KeyPrefixEquals": "use/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "examples/" } }
{ "Condition": { "KeyPrefixEquals": "use/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "examples/" } },
{ "Condition": { "KeyPrefixEquals": "use/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "examples/" } },
{ "Condition": { "KeyPrefixEquals": "docker-io/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "docker-hub/" } }
]
}

View File

@ -26,8 +26,8 @@ for installation instructions.
$ sudo docker pull ubuntu
This will find the `ubuntu` image by name on
[*Docker.io*](/userguide/dockerrepos/#find-public-images-on-dockerio)
and download it from [Docker.io](https://index.docker.io) to a local
[*Docker Hub*](/userguide/dockerrepos/#find-public-images-on-docker-hub)
and download it from [Docker Hub](https://hub.docker.com) to a local
image cache.
> **Note**:

View File

@ -0,0 +1,31 @@
page_title: Accounts on Docker Hub
page_description: Docker Hub accounts
page_keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, documentation
# Accounts on Docker Hub
## Docker Hub Accounts
You can `search` for Docker images and `pull` them from [Docker Hub](https://hub.docker.com)
without signing in or even having an account. However, in order to `push` images,
leave comments or to *star* a repository, you are going to need a [Docker Hub](https://hub.docker.com) account.
### Registration for a Docker Hub Account
You can get a [Docker Hub](https://hub.docker.com) account by
[signing up for one here](https://hub.docker.com/account/signup/). A valid
email address is required to register, which you will need to verify for
account activation.
### Email activation process
You need to have at least one verified email address to be able to use your
[Docker Hub](https://hub.docker.com) account. If you can't find the validation email,
you can request another by visiting the [Resend Email Confirmation](
https://hub.docker.com/account/resend-email-confirmation/) page.
### Password reset process
If you can't access your account for some reason, you can reset your password
from the [*Password Reset*](https://hub.docker.com/account/forgot-password/)
page.

View File

@ -1,13 +1,13 @@
page_title: Automated Builds on Docker.io
page_description: Docker.io Automated Builds
page_keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker.io, docs, documentation, trusted, builds, trusted builds, automated, automated builds
# Automated Builds on Docker.io
page_title: Automated Builds on Docker Hub
page_description: Docker Hub Automated Builds
page_keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, documentation, trusted, builds, trusted builds, automated builds
# Automated Builds on Docker Hub
## Automated Builds
*Automated Builds* is a special feature allowing you to specify a source
repository with a `Dockerfile` to be built by the
[Docker.io](https://index.docker.io) build clusters. The system will
[Docker Hub](https://hub.docker.com) build clusters. The system will
clone your repository and build the `Dockerfile` using the repository as
the context. The resulting image will then be uploaded to the registry
and marked as an *Automated Build*.
@ -26,27 +26,28 @@ on both [GitHub](http://github.com) and
### Setting up Automated Builds with GitHub
In order to setup an Automated Build, you need to first link your [Docker.io](
https://index.docker.io) account with a GitHub one. This will allow the registry
to see your repositories.
In order to setup an Automated Build, you need to first link your
[Docker Hub](https://hub.docker.com) account with a GitHub one. This
will allow the registry to see your repositories.
> *Note:* We currently request access for *read* and *write* since [Docker.io](
> https://index.docker.io) needs to setup a GitHub service hook. Although nothing
> else is done with your account, this is how GitHub manages permissions, sorry!
> *Note:*
> We currently request access for *read* and *write* since
> [Docker Hub](https://hub.docker.com) needs to setup a GitHub service
> hook. Although nothing else is done with your account, this is how
> GitHub manages permissions, sorry!
Click on the [Automated Builds tab](https://index.docker.io/builds/) to
get started and then select [+ Add
New](https://index.docker.io/builds/add/).
Click on the [Automated Builds
tab](https://registry.hub.docker.com/builds/) to get started and then
select [+ Add New](https://registry.hub.docker.com/builds/add/).
Select the [GitHub
service](https://index.docker.io/associate/github/).
Select the [GitHub service](https://registry.hub.docker.com/associate/github/).
Then follow the instructions to authorize and link your GitHub account
to Docker.io.
to Docker Hub.
#### Creating an Automated Build
You can [create an Automated Build](https://index.docker.io/builds/github/select/)
You can [create an Automated Build](https://registry.hub.docker.com/builds/github/select/)
from any of your public or private GitHub repositories with a `Dockerfile`.
#### GitHub organizations
@ -86,29 +87,36 @@ Automated Build:
### Setting up Automated Builds with BitBucket
In order to setup an Automated Build, you need to first link your
[Docker.io]( https://index.docker.io) account with a BitBucket one. This
[Docker Hub](https://hub.docker.com) account with a BitBucket one. This
will allow the registry to see your repositories.
Click on the [Automated Builds tab](https://index.docker.io/builds/) to
Click on the [Automated Builds tab](https://registry.hub.docker.com/builds/) to
get started and then select [+ Add
New](https://index.docker.io/builds/add/).
New](https://registry.hub.docker.com/builds/add/).
Select the [BitBucket
service](https://index.docker.io/associate/bitbucket/).
service](https://registry.hub.docker.com/associate/bitbucket/).
Then follow the instructions to authorize and link your BitBucket account
to Docker.io.
to Docker Hub.
#### Creating an Automated Build
<<<<<<< HEAD:docs/sources/docker-io/builds.md
You can [create an Automated
Build](https://index.docker.io/builds/bitbucket/select/) from any of
your public or private BitBucket repositories with a `Dockerfile`.
=======
You can [create a Trusted
Build](https://registry.hub.docker.com/builds/bitbucket/select/)
from any of your public or private BitBucket repositories with a
`Dockerfile`.
>>>>>>> Initial links:docs/sources/docker-hub/builds.md
### The Dockerfile and Automated Builds
During the build process, we copy the contents of your `Dockerfile`. We also
add it to the [Docker.io](https://index.docker.io) for the Docker community
add it to the [Docker Hub](https://hub.docker.com) for the Docker community
to see on the repository page.
### README.md
@ -163,7 +171,7 @@ payload:
"description":"my docker repo that does cool things",
"is_automated":false,
"full_description":"This is my full description",
"repo_url":"https://index.docker.io/u/username/reponame/",
"repo_url":"https://registry.hub.docker.com/u/username/reponame/",
"owner":"username",
"is_official":false,
"is_private":false,

View File

@ -1,13 +1,13 @@
page_title: The Docker.io Registry Help
page_title: The Docker Hub Registry Help
page_description: The Docker Registry help documentation home
page_keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker.io, docs, documentation
page_keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, documentation
# The Docker.io Registry Help
# The Docker Hub Registry Help
## Introduction
For your questions about the [Docker.io](https://index.docker.io) registry you
For your questions about the [Docker Hub](https://hub.docker.com) registry you
can use [this documentation](docs.md).
If you can not find something you are looking for, please feel free to
[contact us](https://index.docker.io/help/support/).
[contact us](https://docker.com/resources/support/).

View File

@ -1,4 +1,4 @@
# Docker.io
# Docker Hub
## Contents:

View File

@ -1,16 +1,15 @@
page_title: Repositories and Images on Docker.io
page_description: Repositories and Images on Docker.io
page_keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker.io, docs, documentation
page_title: Repositories and Images on Docker Hub
page_description: Repositories and Images on Docker Hub
page_keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker Hub, docs, documentation
# Repositories and Images on Docker.io
# Repositories and Images on Docker Hub
## Searching for repositories and images
You can `search` for all the publicly available repositories and images using
Docker. If a repository is not public (i.e., private), it won't be listed on
the repository search results. To see repository statuses, you can look at your
[profile page](https://index.docker.io/account/) on [Docker.io](
https://index.docker.io).
[profile page](https://hub.docker.com) on [Docker Hub](https://hub.docker.com).
## Repositories
@ -27,8 +26,8 @@ appropriate, you can flag them for the admins' review.
### Private Docker Repositories
To work with a private repository on [Docker.io](https://index.docker.io), you
will need to add one via the [Add Repository](https://index.docker.io/account/repositories/add)
To work with a private repository on [Docker Hub](https://hub.docker.com), you
will need to add one via the [Add Repository](https://registry.hub.docker.com/account/repositories/add/)
link. Once the private repository is created, you can `push` and `pull` images
to and from it using Docker.
@ -45,7 +44,7 @@ designate (i.e., collaborators) from its settings page.
From there, you can also switch repository status (*public* to *private*, or
viceversa). You will need to have an available private repository slot open
before you can do such a switch. If you don't have any, you can always upgrade
your [Docker.io](https://index.docker.io/plans/) plan.
your [Docker Hub](https://registry.hub.docker.com/plans/) plan.
### Collaborators and their role
@ -83,7 +82,7 @@ with a JSON payload similar to the example shown below.
"description":"my docker repo that does cool things",
"is_automated":false,
"full_description":"This is my full description",
"repo_url":"https://index.docker.io/u/username/reponame/",
"repo_url":"https://registry.hub.docker.com/u/username/reponame/",
"owner":"username",
"is_official":false,
"is_private":false,

View File

@ -1,32 +0,0 @@
page_title: Accounts on Docker.io
page_description: Docker.io accounts
page_keywords: Docker, docker, registry, accounts, plans, Dockerfile, Docker.io, docs, documentation
# Accounts on Docker.io
## Docker.io Accounts
You can `search` for Docker images and `pull` them from [Docker.io](https://index.docker.io)
without signing in or even having an account. However, in order to `push` images,
leave comments or to *star* a repository, you are going to need a [Docker.io](
https://www.docker.io) account.
### Registration for a Docker.io Account
You can get a [Docker.io](https://index.docker.io) account by
[signing up for one here](https://www.docker.io/account/signup/). A valid
email address is required to register, which you will need to verify for
account activation.
### Email activation process
You need to have at least one verified email address to be able to use your
[Docker.io](https://index.docker.io) account. If you can't find the validation email,
you can request another by visiting the [Resend Email Confirmation](
https://www.docker.io/account/resend-email-confirmation/) page.
### Password reset process
If you can't access your account for some reason, you can reset your password
from the [*Password Reset*](https://www.docker.io/account/forgot-password/)
page.

View File

@ -1,15 +1,14 @@
page_title: Dockerizing MongoDB
page_description: Creating a Docker image with MongoDB pre-installed using a Dockerfile and sharing the image on Docker.io
page_description: Creating a Docker image with MongoDB pre-installed using a Dockerfile and sharing the image on Docker Hub
page_keywords: docker, dockerize, dockerizing, article, example, docker.io, platform, package, installation, networking, mongodb, containers, images, image, sharing, dockerfile, build, auto-building, virtualization, framework
# Dockerizing MongoDB
## Introduction
In this example, we are going to learn how to build a Docker image
with MongoDB pre-installed.
We'll also see how to `push` that image to the [Docker.io registry](
https://index.docker.io) and share it with others!
In this example, we are going to learn how to build a Docker image with
MongoDB pre-installed. We'll also see how to `push` that image to the
[Docker Hub registry](https://hub.docker.com) and share it with others!
Using Docker and containers for deploying [MongoDB](https://www.mongodb.org/)
instances will bring several benefits, such as:
@ -41,7 +40,7 @@ Although optional, it is handy to have comments at the beginning of a
> the *parent* of your *Dockerized MongoDB* image.
We will build our image using the latest version of Ubuntu from the
[Docker.io Ubuntu](https://index.docker.io/_/ubuntu/) repository.
[Docker Hub Ubuntu](https://registry.hub.docker.com/_/ubuntu/) repository.
# Format: FROM repository[:version]
FROM ubuntu:latest
@ -109,10 +108,10 @@ experimenting, it is always a good practice to tag Docker images by passing the
Once this command is issued, Docker will go through the `Dockerfile` and build
the image. The final image will be tagged `my/repo`.
## Pushing the MongoDB image to Docker.io
## Pushing the MongoDB image to Docker Hub
All Docker image repositories can be hosted and shared on
[Docker.io](https://index.docker.io) with the `docker push` command. For this,
[Docker Hub](https://hub.docker.com) with the `docker push` command. For this,
you need to be logged-in.
# Log-in

View File

@ -65,9 +65,9 @@ requires to build (this example uses Docker 0.3.4):
# DOCKER-VERSION 0.3.4
Next, define the parent image you want to use to build your own image on
top of. Here, we'll use [CentOS](https://index.docker.io/_/centos/)
(tag: `6.4`) available on the [Docker
index](https://index.docker.io/):
top of. Here, we'll use
[CentOS](https://registry.hub.docker.com/_/centos/) (tag: `6.4`)
available on the [Docker Hub](https://hub.docker.com/):
FROM centos:6.4

View File

@ -11,7 +11,7 @@ page_keywords: docker, example, package installation, postgresql
## Installing PostgreSQL on Docker
Assuming there is no Docker image that suits your needs on the [Docker
Hub]( http://index.docker.io), you can create one yourself.
Hub](http://hub.docker.com), you can create one yourself.
Start by creating a new `Dockerfile`:

View File

@ -14,8 +14,8 @@ Create an empty file called `Dockerfile`:
$ touch Dockerfile
Next, define the parent image you want to use to build your image on top
of. We'll use [Ubuntu](https://index.docker.io/_/ubuntu/) (tag:
`latest`), which is available on [Docker Hub](http://index.docker.io):
of. We'll use [Ubuntu](https://registry.hub.docker.cm/_/ubuntu/) (tag:
`latest`), which is available on [Docker Hub](https://hub.docker.com):
# Riak
#

View File

@ -96,7 +96,7 @@ functionalities:
all your future projects. And so on.
- *Sharing.*
Docker has access to a [public registry](http://index.docker.io) where
Docker has access to a [public registry](https://hub.docker.com) where
thousands of people have uploaded useful containers: anything from Redis,
CouchDB, Postgres to IRC bouncers to Rails app servers to Hadoop to
base images for various Linux distros. The

View File

@ -17,7 +17,7 @@ Docker consists of:
* The Docker Engine - our lightweight and powerful open source container
virtualization technology combined with a work flow for building
and containerizing your applications.
* [Docker.io](https://index.docker.io) - our SAAS service for
* [Docker Hub](https://hub.docker.com) - our SAAS service for
sharing and managing your application stacks.
## Why Docker?

View File

@ -70,7 +70,7 @@ resources you have.
Docker has two major components:
* Docker: the open source container virtualization platform.
* [Docker.io](https://index.docker.io): our Software-as-a-Service
* [Docker Hub](https://hub.docker.com): our Software-as-a-Service
platform for sharing and managing Docker containers.
**Note:** Docker is licensed with the open source Apache 2.0 license.
@ -119,7 +119,7 @@ portion of Docker.
Docker registries hold images. These are public (or private!) stores
that you can upload or download images to and from. The public Docker
registry is called [Docker.io](http://index.docker.io). It provides a
registry is called [Docker Hub](https://hub.docker.com). It provides a
huge collection of existing images that you can use. These images can be
images you create yourself or you can make use of images that others
have previously created. You can consider Docker registries the
@ -142,7 +142,7 @@ We've learned so far that:
2. You can create Docker containers from those Docker images to run your
applications.
3. You can share those Docker images via
[Docker.io](https://index.docker.io) or your own registry.
[Docker Hub](https://hub.docker.com) or your own registry.
Let's look at how these elements combine together to make Docker work.
@ -169,7 +169,7 @@ own as the basis for a new image, for example if you have a base Apache
image you could use this as the base of all your web application images.
> **Note:**
> Docker usually gets these base images from [Docker.io](https://index.docker.io).
> Docker usually gets these base images from [Docker Hub](https://hub.docker.com).
Docker images are then built from these base images using a simple
descriptive set of steps we call *instructions*. Each instruction
@ -187,19 +187,19 @@ instructions and returns a final image.
### How does a Docker registry work?
The Docker registry is the store for your Docker images. Once you build
a Docker image you can *push* it to a public registry [Docker.io](
https://index.docker.io) or to your own registry running behind your
a Docker image you can *push* it to a public registry [Docker
Hub](https://hub.docker.com) or to your own registry running behind your
firewall.
Using the Docker client, you can search for already published images and
then pull them down to your Docker host to build containers from them.
[Docker.io](https://index.docker.io) provides both public and
[Docker Hub](https://hub.docker.com) provides both public and
private storage for images. Public storage is searchable and can be
downloaded by anyone. Private storage is excluded from search
results and only you and your users can pull them down and use them to
build containers. You can [sign up for a plan
here](https://index.docker.io/plans).
here](https://registry.hub.docker.com/plans/).
### How does a container work?
@ -236,7 +236,7 @@ Docker begins with:
- **Pulling the `ubuntu` image:**
Docker checks for the presence of the `ubuntu` image and if it doesn't
exist locally on the host, then Docker downloads it from
[Docker.io](https://index.docker.io). If the image already exists then
[Docker Hub](https://hub.docker.com). If the image already exists then
Docker uses it for the new container.
- **Creates a new container:**
Once Docker has the image it creates a container from it:

View File

@ -42,7 +42,7 @@ interfaces:
- [3 Authorization](registry_api/#authorization)
- [Docker.io API](index_api/)
- [Docker Hub API](index_api/)
- [1. Brief introduction](index_api/#brief-introduction)
- [2. Endpoints](index_api/#endpoints)
- [2.1 Repository](index_api/#repository)

View File

@ -1,12 +1,12 @@
page_title: Docker.io API
page_description: API Documentation for the Docker.io API
page_keywords: API, Docker, index, REST, documentation, Docker.io, registry
page_title: Docker Hub API
page_description: API Documentation for the Docker Hub API
page_keywords: API, Docker, index, REST, documentation, Docker Hub, registry
# Docker.io API
# Docker Hub API
## Introduction
- This is the REST API for [Docker.io](http://index.docker.io).
- This is the REST API for [Docker Hub](https://hub.docker.com).
- Authorization is done with basic auth over SSL
- Not all commands require authentication, only those noted as such.

View File

@ -734,7 +734,7 @@ Remove the image `name` from the filesystem
`GET /images/search`
Search for an image on [Docker.io](https://index.docker.io)
Search for an image on [Docker Hub](https://hub.docker.com)
**Example request**:

View File

@ -745,7 +745,7 @@ Remove the image `name` from the filesystem
`GET /images/search`
Search for an image on [Docker.io](https://index.docker.io)
Search for an image on [Docker Hub](https://hub.docker.com)
**Example request**:

View File

@ -932,7 +932,7 @@ Tag the image `name` into a repository
`GET /images/search`
Search for an image on [Docker.io](https://index.docker.io).
Search for an image on [Docker Hub](https://hub.docker.com).
> **Note**:
> The response keys have changed from API v1.6 to reflect the JSON

View File

@ -948,7 +948,7 @@ Remove the image `name` from the filesystem
`GET /images/search`
Search for an image on [Docker.io](https://index.docker.io).
Search for an image on [Docker Hub](https://hub.docker.com).
> **Note**:
> The response keys have changed from API v1.6 to reflect the JSON

View File

@ -983,7 +983,7 @@ Remove the image `name` from the filesystem
`GET /images/search`
Search for an image on [Docker.io](https://index.docker.io).
Search for an image on [Docker Hub](https://hub.docker.com).
> **Note**:
> The response keys have changed from API v1.6 to reflect the JSON

View File

@ -772,7 +772,7 @@ Remove the image `name` from the filesystem
`GET /images/search`
Search for an image on [Docker.io](https://index.docker.io)
Search for an image on [Docker Hub](https://hub.docker.com)
**Example request**:

View File

@ -821,7 +821,7 @@ Remove the image `name` from the filesystem
`GET /images/search`
Search for an image on [Docker.io](https://index.docker.io)
Search for an image on [Docker Hub](https://hub.docker.com)
**Example request**:

View File

@ -866,7 +866,7 @@ Remove the image `name` from the filesystem
`GET /images/search`
Search for an image on [Docker.io](https://index.docker.io)
Search for an image on [Docker Hub](https://hub.docker.com)
**Example request**:

View File

@ -871,7 +871,7 @@ Remove the image `name` from the filesystem
`GET /images/search`
Search for an image on [Docker.io](https://index.docker.io)
Search for an image on [Docker Hub](https://hub.docker.com)
**Example request**:

View File

@ -975,7 +975,7 @@ Remove the image `name` from the filesystem
`GET /images/search`
Search for an image on [Docker.io](https://index.docker.io)
Search for an image on [Docker Hub](https://hub.docker.com)
**Example request**:

View File

@ -901,7 +901,7 @@ Remove the image `name` from the filesystem
`GET /images/search`
Search for an image on [Docker.io](https://index.docker.io).
Search for an image on [Docker Hub](https://hub.docker.com).
> **Note**:
> The response keys have changed from API v1.6 to reflect the JSON

View File

@ -943,7 +943,7 @@ Remove the image `name` from the filesystem
`GET /images/search`
Search for an image on [Docker.io](https://index.docker.io).
Search for an image on [Docker Hub](https://hub.docker.com).
> **Note**:
> The response keys have changed from API v1.6 to reflect the JSON

View File

@ -946,7 +946,7 @@ Tag the image `name` into a repository
`GET /images/search`
Search for an image on [Docker.io](https://index.docker.io).
Search for an image on [Docker Hub](https://hub.docker.com).
> **Note**:
> The response keys have changed from API v1.6 to reflect the JSON

View File

@ -740,9 +740,9 @@ Running `docker ps` showing 2 linked containers.
Pull an image or a repository from the registry
Most of your images will be created on top of a base image from the
[Docker.io](https://index.docker.io) registry.
[Docker Hub](https://hub.docker.com) registry.
[Docker.io](https://index.docker.io) contains many pre-built images that you
[Docker Hub](https://hub.docker.com) contains many pre-built images that you
can `pull` and try without needing to define and configure your own.
To download a particular image, or set of images (i.e., a repository),
@ -761,7 +761,7 @@ use `docker pull`:
Push an image or a repository to the registry
Use `docker push` to share your images to the [Docker.io](https://index.docker.io)
Use `docker push` to share your images to the [Docker Hub](https://hub.docker.com)
registry or to a self-hosted one.
## restart
@ -1117,7 +1117,7 @@ It is used to create a backup that can then be used with
## search
Search [Docker.io](https://index.docker.io) for images
Search [Docker Hub](https://hub.docker.com) for images
Usage: docker search TERM
@ -1127,9 +1127,9 @@ Search [Docker.io](https://index.docker.io) for images
-s, --stars=0 Only displays with at least xxx stars
--automated=false Only show automated builds
See [*Find Public Images on Docker.io*](
/userguide/dockerrepos/#find-public-images-on-dockerio) for
more details on finding shared images from the commandline.
See [*Find Public Images on Docker Hub*](
/userguide/dockerrepos/#find-public-images-on-docker-hub) for
more details on finding shared images from the command line.
## start

View File

@ -11,7 +11,7 @@ A Registry is a hosted service containing
[*images*](/terms/image/#image-def) which responds to the Registry API.
The default registry can be accessed using a browser at
[Docker.io](http://index.docker.io) or using the
[Docker Hub](https://hub.docker.com) or using the
`sudo docker search` command.
## Further Reading

View File

@ -1,15 +1,15 @@
page_title: Getting started with Docker.io
page_description: Introductory guide to getting an account on Docker.io
page_title: Getting started with Docker Hub
page_description: Introductory guide to getting an account on Docker Hub
page_keywords: documentation, docs, the docker guide, docker guide, docker, docker platform, virtualization framework, docker.io, central service, services, how to, container, containers, automation, collaboration, collaborators, registry, repo, repository, technology, github webhooks, trusted builds
# Getting Started with Docker.io
# Getting Started with Docker Hub
*How do I use Docker.io?*
*How do I use Docker Hub?*
In this section we're going to introduce you, very quickly!, to
[Docker.io](https://index.docker.io) and create an account.
[Docker Hub](https://hub.docker.com) and create an account.
[Docker.io](https://www.docker.io) is the central hub for Docker. It
[Docker Hub](https://www.docker.io) is the central hub for Docker. It
helps you to manage Docker and its components. It provides services such
as:
@ -19,15 +19,15 @@ as:
hooks.
* Integration with GitHub and BitBucket.
Docker.io helps you collaborate with colleagues and get the most out of
Docker Hub helps you collaborate with colleagues and get the most out of
Docker.
In order to use Docker.io you will need to register an account. Don't
In order to use Docker Hub you will need to register an account. Don't
panic! It's totally free and really easy.
## Creating a Docker.io Account
## Creating a Docker Hub Account
There are two ways you can create a Docker.io account:
There are two ways you can create a Docker Hub account:
* Via the web, or
* Via the command line.
@ -41,7 +41,7 @@ choose your user name and specify some details such as an email address.
### Signup via the command line
You can also create a Docker.io account via the command line using the
You can also create a Docker Hub account via the command line using the
`docker login` command.
$ sudo docker login
@ -63,7 +63,7 @@ Or via the command line and the `docker login` command:
$ sudo docker login
Now your Docker.io account is active and ready for you to use!
Now your Docker Hub account is active and ready for you to use!
## Next steps

View File

@ -1,6 +1,6 @@
page_title: Working with Docker Images
page_description: How to work with Docker images.
page_keywords: documentation, docs, the docker guide, docker guide, docker, docker platform, virtualization framework, docker.io, Docker images, Docker image, image management, Docker repos, Docker repositories, docker, docker tag, docker tags, Docker.io, collaboration
page_keywords: documentation, docs, the docker guide, docker guide, docker, docker platform, virtualization framework, docker.io, Docker images, Docker image, image management, Docker repos, Docker repositories, docker, docker tag, docker tags, Docker Hub, collaboration
# Working with Docker Images
@ -13,14 +13,14 @@ image and the `training/webapp` image.
We've also discovered that Docker stores downloaded images on the Docker
host. If an image isn't already present on the host then it'll be
downloaded from a registry: by default the
[Docker.io](https://index.docker.io) public registry.
[Docker Hub](https://hub.docker.com) public registry.
In this section we're going to explore Docker images a bit more
including:
* Managing and working with images locally on your Docker host;
* Creating basic images;
* Uploading images to [Docker.io](https://index.docker.io).
* Uploading images to [Docker Hub](https://hub.docker.com).
## Listing images on the host
@ -45,7 +45,7 @@ do this using the `docker images` command like so:
ubuntu lucid 3db9c44f4520 4 weeks ago 183 MB
We can see the images we've previously used in our [user guide](/userguide/).
Each has been downloaded from [Docker.io](https://index.docker.io) when we
Each has been downloaded from [Docker Hub](https://hub.docker.com) when we
launched a container using that image.
We can see three crucial pieces of information about our images in the listing.
@ -104,8 +104,8 @@ download the image.
One of the features of Docker is that a lot of people have created Docker
images for a variety of purposes. Many of these have been uploaded to
[Docker.io](https://index.docker.io). We can search these images on the
[Docker.io](https://index.docker.io) website.
[Docker Hub](https://hub.docker.com). We can search these images on the
[Docker Hub](https://hub.docker.com) website.
![indexsearch](/userguide/search.png)
@ -359,12 +359,12 @@ Let's see our new tag using the `docker images` command.
ouruser/sinatra devel 5db5f8471261 11 hours ago 446.7 MB
ouruser/sinatra v2 5db5f8471261 11 hours ago 446.7 MB
## Push an image to Docker.io
## Push an image to Docker Hub
Once you've built or created a new image you can push it to [Docker.io](
https://index.docker.io) using the `docker push` command. This allows you to
share it with others, either publicly, or push it into [a private
repository](https://index.docker.io/plans/).
Once you've built or created a new image you can push it to [Docker
Hub](https://hub.docker.com) using the `docker push` command. This
allows you to share it with others, either publicly, or push it into [a
private repository](https://registry.hub.docker.com/plans/).
$ sudo docker push ouruser/sinatra
The push refers to a repository [ouruser/sinatra] (len: 1)

View File

@ -30,7 +30,7 @@ operating system image.
When you specify an image, Docker looks first for the image on your
Docker host. If it can't find it then it downloads the image from the public
image registry: [Docker.io](https://index.docker.io).
image registry: [Docker Hub](https://hub.docker.com).
Next we told Docker what command to run inside our new container:

View File

@ -1,8 +1,8 @@
page_title: Working with Docker.io
page_description: Learning how to use Docker.io to manage images and work flow
page_keywords: repo, Docker.io, Docker Hub, registry, index, repositories, usage, pull image, push image, image, documentation
page_title: Working with Docker Hub
page_description: Learning how to use Docker Hub to manage images and work flow
page_keywords: repo, Docker Hub, Docker Hub, registry, index, repositories, usage, pull image, push image, image, documentation
# Working with Docker.io
# Working with Docker Hub
So far we've seen a lot about how to use Docker on the command line and
your local host. We've seen [how to pull down
@ -10,10 +10,10 @@ images](/userguide/usingdocker/) that you can run your containers from
and we've seen how to [create your own images](/userguide/dockerimages).
Now we're going to learn a bit more about
[Docker.io](https://index.docker.io) and how you can use it to enhance
[Docker Hub](https://hub.docker.com) and how you can use it to enhance
your Docker work flows.
[Docker.io](https://index.docker.io) is the public registry that Docker
[Docker Hub](https://hub.docker.com) is the public registry that Docker
Inc maintains. It contains a huge collection of images, over 15,000,
that you can download and use to build your containers. It also provides
authentication, structure (you can setup teams and organizations), work
@ -21,7 +21,7 @@ flow tools like webhooks and build triggers as well as privacy features
like private repositories for storing images you don't want to publicly
share.
## Docker commands and Docker.io
## Docker commands and Docker Hub
Docker acts as a client for these services via the `docker search`,
`pull`, `login` and `push` commands.
@ -29,7 +29,7 @@ Docker acts as a client for these services via the `docker search`,
## Searching for images
As we've already seen we can search the
[Docker.io](https://index.docker.io) registry via it's search interface
[Docker Hub](https://hub.docker.com) registry via it's search interface
or using the command line interface. Searching can find images by name,
user name or description:
@ -57,15 +57,15 @@ Once you have found the image you want, you can download it:
The image is now available to run a container from.
## Contributing to Docker.io
## Contributing to Docker Hub
Anyone can pull public images from the [Docker.io](http://index.docker.io)
Anyone can pull public images from the [Docker Hub](https://hub.docker.com)
registry, but if you would like to share your own images, then you must
register a user first as we saw in the [first section of the Docker User
Guide](/userguide/dockerio/).
Guide](/userguide/dockerhub/).
To refresh your memory, you can create your user name and login to
[Docker.io](https://index.docker.io/account/signup/), or by running:
[Docker Hub](https://hub.docker.com/account/signup/), or by running:
$ sudo docker login
@ -85,7 +85,7 @@ you in. Now you're ready to commit and push your own images!
> Your authentication credentials will be stored in the [`.dockercfg`
> authentication file](#authentication-file) in your home directory.
## Pushing a repository to Docker.io
## Pushing a repository to Docker Hub
In order to push an repository to its registry you need to have named an image,
or committed your container to a named image as we saw
@ -98,9 +98,9 @@ or tag.
The image will then be uploaded and available for use.
## Features of Docker.io
## Features of Docker Hub
Now let's look at some of the features of Docker.io. You can find more
Now let's look at some of the features of Docker Hub. You can find more
information [here](/docker-io/).
* Private repositories
@ -111,29 +111,29 @@ information [here](/docker-io/).
## Private Repositories
Sometimes you have images you don't want to make public and share with
everyone. So Docker.io allows you to have private repositories. You can
sign up for a plan [here](https://index.docker.io/plans/).
everyone. So Docker Hub allows you to have private repositories. You can
sign up for a plan [here](https://registry.hub.docker.com/plans/).
## Organizations and teams
One of the useful aspects of private repositories is that you can share
them only with members of your organization or team. Docker.io lets you
them only with members of your organization or team. Docker Hub lets you
create organizations where you can collaborate with your colleagues and
manage private repositories. You can create and manage an organization
[here](https://index.docker.io/account/organizations/).
[here](https://registry.hub.docker.com/account/organizations/).
## Automated Builds
Automated Builds automate the building and updating of images from [GitHub](https://www.github.com)
or [BitBucket](http://bitbucket.com), directly on Docker.io. It works by adding a commit hook to
or [BitBucket](http://bitbucket.com), directly on Docker Hub. It works by adding a commit hook to
your selected GitHub or BitBucket repository, triggering a build and update when you push a
commit.
### To setup an Automated Build
1. Create a [Docker.io account](https://index.docker.io/) and login.
2. Link your GitHub or BitBucket account through the [`Link Accounts`](https://index.docker.io/account/accounts/) menu.
3. [Configure an Automated Build](https://index.docker.io/builds/).
1. Create a [Docker Hub account](https://hub.docker.com/) and login.
2. Link your GitHub or BitBucket account through the [`Link Accounts`](https://registry.hub.docker.com/account/accounts/) menu.
3. [Configure an Automated Build](https://registry.hub.docker.com/builds/).
4. Pick a GitHub or BitBucket project that has a `Dockerfile` that you want to build.
5. Pick the branch you want to build (the default is the `master` branch).
6. Give the Automated Build a name.
@ -142,12 +142,12 @@ commit.
Once the Automated Build is configured it will automatically trigger a
build, and in a few minutes, if there are no errors, you will see your
new Automated Build on the [Docker.io](https://index.docker.io) Registry.
new Automated Build on the [Docker Hub](https://hub.docker.com) Registry.
It will stay in sync with your GitHub and BitBucket repository until you
deactivate the Automated Build.
If you want to see the status of your Automated Builds you can go to your
[Automated Builds page](https://index.docker.io/builds/) on the Docker.io,
[Automated Builds page](https://registry.hub.docker.io/builds/) on the Docker Hub,
and it will show you the status of your builds, and the build history.
Once you've created an Automated Build you can deactivate or delete it. You
@ -160,7 +160,7 @@ to point to specific `Dockerfile`'s or Git branches.
### Build Triggers
Automated Builds can also be triggered via a URL on Docker.io. This
Automated Builds can also be triggered via a URL on Docker Hub. This
allows you to rebuild an Automated build image on demand.
## Webhooks

View File

@ -135,8 +135,8 @@ restore testing using your preferred tools.
Now we've learned a bit more about how to use Docker we're going to see how to
combine Docker with the services available on
[Docker.io](https://index.docker.io) including Automated Builds and private
[Docker Hub](https://hub.docker.com) including Automated Builds and private
repositories.
Go to [Working with Docker.io](/userguide/dockerrepos).
Go to [Working with Docker Hub](/userguide/dockerrepos).

View File

@ -19,15 +19,15 @@ Well teach you how to use Docker to:
We've broken this guide into major sections that take you through
the Docker life cycle:
## Getting Started with Docker.io
## Getting Started with Docker Hub
*How do I use Docker.io?*
*How do I use Docker Hub?*
Docker.io is the central hub for Docker. It hosts public Docker images
Docker Hub is the central hub for Docker. It hosts public Docker images
and provides services to help you build and manage your Docker
environment. To learn more;
Go to [Using Docker.io](/userguide/dockerio).
Go to [Using Docker Hub](/userguide/dockerhub).
## Dockerizing Applications: A "Hello World!"
@ -72,18 +72,18 @@ learning how to manage data, volumes and mounts inside our containers.
Go to [Managing Data in Containers](/userguide/dockervolumes).
## Working with Docker.io
## Working with Docker Hub
Now we've learned a bit more about how to use Docker we're going to see
how to combine Docker with the services available on Docker.io including
Automated Builds and private repositories.
how to combine Docker with the services available on Docker Hub including
Trusted Builds and private repositories.
Go to [Working with Docker.io](/userguide/dockerrepos).
Go to [Working with Docker Hub](/userguide/dockerrepos).
## Getting help
* [Docker homepage](http://www.docker.io/)
* [Docker.io](http://index.docker.io)
* [Docker Hub](https://hub.docker.com)
* [Docker blog](http://blog.docker.io/)
* [Docker documentation](http://docs.docker.io/)
* [Docker Getting Started Guide](http://www.docker.io/gettingstarted/)

View File

@ -309,7 +309,7 @@ And now our container is stopped and deleted.
# Next steps
Until now we've only used images that we've downloaded from
[Docker.io](https://index.docker.io) now let's get introduced to
[Docker Hub](https://hub.docker.com) now let's get introduced to
building and sharing our own images.
Go to [Working with Docker Images](/userguide/dockerimages).