Преглед на файлове

Merge pull request #20946 from thaJeztah/update-registry-links

Update links to Docker Hub
Sebastiaan van Stijn преди 9 години
родител
ревизия
44fb8fa588

+ 1 - 1
docs/admin/logging/fluentd.md

@@ -101,7 +101,7 @@ and [its documents](http://docs.fluentd.org/).
 
 To use this logging driver, start the `fluentd` daemon on a host. We recommend
 that you use [the Fluentd docker
-image](https://registry.hub.docker.com/u/fluent/fluentd/). This image is
+image](https://hub.docker.com/r/fluent/fluentd/). This image is
 especially useful if you want to aggregate multiple container logs on a each
 host then, later, transfer the logs to another Fluentd node to create an
 aggregate store.

+ 2 - 2
docs/examples/mongodb.md

@@ -17,7 +17,7 @@ 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!
 
 > **Note:** This guide will show the mechanics of building a MongoDB container, but
-> you will probably want to use the official image on [Docker Hub]( https://registry.hub.docker.com/_/mongo/)
+> you will probably want to use the official image on [Docker Hub]( https://hub.docker.com/_/mongo/)
 
 Using Docker and containers for deploying [MongoDB](https://www.mongodb.org/)
 instances will bring several benefits, such as:
@@ -49,7 +49,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 Hub Ubuntu](https://registry.hub.docker.com/_/ubuntu/) repository.
+[Docker Hub Ubuntu](https://hub.docker.com/_/ubuntu/) repository.
 
     # Format: FROM    repository[:version]
     FROM       ubuntu:latest

+ 1 - 1
docs/examples/nodejs_web_app.md

@@ -67,7 +67,7 @@ Open the `Dockerfile` in your favorite text editor
 
 Define the parent image you want to use to build your own image on
 top of. Here, we'll use
-[CentOS](https://registry.hub.docker.com/_/centos/) (tag: `centos6`)
+[CentOS](https://hub.docker.com/_/centos/) (tag: `centos6`)
 available on the [Docker Hub](https://hub.docker.com/):
 
     FROM    centos:centos6

+ 1 - 1
docs/examples/running_riak_service.md

@@ -20,7 +20,7 @@ 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://registry.hub.docker.com/_/ubuntu/) (tag:
+of. We'll use [Ubuntu](https://hub.docker.com/_/ubuntu/) (tag:
 `trusty`), which is available on [Docker Hub](https://hub.docker.com):
 
     # Riak

+ 1 - 1
docs/installation/linux/cruxlinux.md

@@ -64,7 +64,7 @@ or use it as part of your `FROM` line in your `Dockerfile(s)`.
     $ docker pull crux
     $ docker run -i -t crux
 
-There are also user contributed [CRUX based image(s)](https://registry.hub.docker.com/repos/crux/) on the Docker Hub.
+There are also user contributed [CRUX based image(s)](https://hub.docker.com/_/crux/) on the Docker Hub.
 
 
 ## Uninstallation

+ 2 - 2
docs/reference/glossary.md

@@ -178,8 +178,8 @@ A repository is a set of Docker images. A repository can be shared by pushing it
 to a [registry](#registry) server. The different images in the repository can be
 labeled using [tags](#tag).
 
-Here is an example of the shared [nginx repository](https://registry.hub.docker.com/_/nginx/)
-and its [tags](https://registry.hub.docker.com/_/nginx/tags/manage/)
+Here is an example of the shared [nginx repository](https://hub.docker.com/_/nginx/)
+and its [tags](https://hub.docker.com/r/library/nginx/tags/)
 
 ## Swarm
 

+ 3 - 3
docs/userguide/containers/dockerimages.md

@@ -19,14 +19,14 @@ used Docker images that already exist, for example the `ubuntu` image and the
 
 You 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 Hub Registry](https://registry.hub.docker.com).
+registry: by default the [Docker Hub Registry](https://hub.docker.com).
 
 In this section you'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 Hub Registry](https://registry.hub.docker.com).
+* Uploading images to [Docker Hub Registry](https://hub.docker.com).
 
 ## Listing images on the host
 
@@ -521,7 +521,7 @@ You can also reference by digest in `create`, `run`, and `rmi` commands, as well
 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/).
+private repository](https://hub.docker.com/account/billing-plans/).
 
     $ docker push ouruser/sinatra
     The push refers to a repository [ouruser/sinatra] (len: 1)

+ 4 - 4
docs/userguide/containers/dockerrepos.md

@@ -120,7 +120,7 @@ information [here](https://docs.docker.com/docker-hub/).
 
 Sometimes you have images you don't want to make public and share with
 everyone. So Docker Hub allows you to have private repositories. You can
-sign up for a plan [here](https://registry.hub.docker.com/plans/).
+sign up for a plan [here](https://hub.docker.com/account/billing-plans/).
 
 ### Organizations and teams
 
@@ -128,7 +128,7 @@ One of the useful aspects of private repositories is that you can share
 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 learn how to create and manage an organization
-[here](https://registry.hub.docker.com/account/organizations/).
+[here](https://hub.docker.com/organizations/).
 
 ### Automated Builds
 
@@ -140,8 +140,8 @@ triggering a build and update when you push a commit.
 #### To setup an Automated Build
 
 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/add/).
+2.  Link your GitHub or Bitbucket account on the ["Linked Accounts & Services"](https://hub.docker.com/account/authorized-services/) page.
+3.  Select "Create Automated Build" from the "Create" dropdown menu
 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.

+ 6 - 6
docs/userguide/eng-image/dockerfile_best-practices.md

@@ -130,7 +130,7 @@ various instructions available for use in a `Dockerfile`.
 [Dockerfile reference for the FROM instruction](../../reference/builder.md#from)
 
 Whenever possible, use current Official Repositories as the basis for your
-image. We recommend the [Debian image](https://registry.hub.docker.com/_/debian/)
+image. We recommend the [Debian image](https://hub.docker.com/_/debian/)
 since it’s very tightly controlled and kept extremely minimal (currently under
 100 mb), while still being a full distribution.
 
@@ -365,7 +365,7 @@ The `ENTRYPOINT` instruction can also be used in combination with a helper
 script, allowing it to function in a similar way to the command above, even
 when starting the tool may require more than one step.
 
-For example, the [Postgres Official Image](https://registry.hub.docker.com/_/postgres/)
+For example, the [Postgres Official Image](https://hub.docker.com/_/postgres/)
 uses the following script as its `ENTRYPOINT`:
 
 ```bash
@@ -481,10 +481,10 @@ allowing the `Dockerfile` author to make a choice.
 
 These Official Repositories have exemplary `Dockerfile`s:
 
-* [Go](https://registry.hub.docker.com/_/golang/)
-* [Perl](https://registry.hub.docker.com/_/perl/)
-* [Hy](https://registry.hub.docker.com/_/hylang/)
-* [Rails](https://registry.hub.docker.com/_/rails)
+* [Go](https://hub.docker.com/_/golang/)
+* [Perl](https://hub.docker.com/_/perl/)
+* [Hy](https://hub.docker.com/_/hylang/)
+* [Rails](https://hub.docker.com/_/rails)
 
 ## Additional resources: