diff --git a/desktop/index.md b/desktop/index.md index 4081945699..8831cc36b9 100644 --- a/desktop/index.md +++ b/desktop/index.md @@ -6,7 +6,7 @@ toc_min: 1 toc_max: 2 --- -Docker Desktop is an easy-to-install application for your Mac or Windows environment that enables you to build and share containerized applications and microservices. Docker Desktop includes [Docker Engine](../engine/), Docker CLI client, [Docker Compose](../compose/), [Notary](../notary/getting_started/), [Kubernetes](https://github.com/kubernetes/kubernetes/), and [Credential Helper](https://github.com/docker/docker-credential-helpers/). +Docker Desktop is an easy-to-install application for your Mac or Windows environment that enables you to build and share containerized applications and microservices. Docker Desktop includes [Docker Engine](../engine/), Docker CLI client, [Docker Compose](../compose/), [Docker Content Trust](../engine/security/trust.md), [Kubernetes](https://github.com/kubernetes/kubernetes/), and [Credential Helper](https://github.com/docker/docker-credential-helpers/). Docker Desktop works with your choice of development tools and languages and gives you access to a vast library of certified images and templates in [Docker Hub](https://hub.docker.com/). This enables development teams to extend their environment to rapidly auto-build, continuously integrate and collaborate using a secure repository. diff --git a/docker-for-mac/install.md b/docker-for-mac/install.md index a97520c37e..c9e6b8bfa8 100644 --- a/docker-for-mac/install.md +++ b/docker-for-mac/install.md @@ -58,7 +58,7 @@ Your Mac must meet the following requirements to successfully install Docker Des The Docker Desktop installation includes [Docker Engine](../engine/index.md), Docker CLI client, - [Docker Compose](../compose/index.md), [Notary](../notary/getting_started.md), [Kubernetes](https://github.com/kubernetes/kubernetes/), and [Credential Helper](https://github.com/docker/docker-credential-helpers/). + [Docker Compose](../compose/index.md), [Docker Content Trust](../engine/security/trust.md), [Kubernetes](https://github.com/kubernetes/kubernetes/), and [Credential Helper](https://github.com/docker/docker-credential-helpers/). ## Install and run Docker Desktop on Mac diff --git a/docker-for-windows/install.md b/docker-for-windows/install.md index 18b00c1568..e526480827 100644 --- a/docker-for-windows/install.md +++ b/docker-for-windows/install.md @@ -73,7 +73,7 @@ Hyper-V on Windows 10: The Docker Desktop installation includes [Docker Engine](../engine/index.md), Docker CLI client, [Docker Compose](../compose/index.md), -[Notary](../notary/getting_started.md), +[Docker Content Trust](../engine/security/trust.md), [Kubernetes](https://github.com/kubernetes/kubernetes/), and [Credential Helper](https://github.com/docker/docker-credential-helpers/). diff --git a/engine/security/trust/deploying_notary.md b/engine/security/trust/deploying_notary.md index 4962deb989..b3a6ad3c13 100644 --- a/engine/security/trust/deploying_notary.md +++ b/engine/security/trust/deploying_notary.md @@ -15,7 +15,7 @@ The easiest way to deploy Notary Server is by using Docker Compose. To follow th docker-compose up -d - For more detailed documentation about how to deploy Notary Server, see the [instructions to run a Notary service](../../../notary/running_a_service.md) as well as [the Notary repository](https://github.com/theupdateframework/notary) for more information. + For more detailed documentation about how to deploy Notary Server, see the [instructions to run a Notary service](https://github.com/theupdateframework/notary/blob/master/docs/running_a_service.md){:target="_blank" rel="noopener" class="_"} as well as [the Notary repository](https://github.com/theupdateframework/notary){:target="_blank" rel="noopener" class="_"} for more information. 3. Make sure that your Docker or Notary client trusts Notary Server's certificate before you try to interact with the Notary server. See the instructions for [Docker](../../reference/commandline/cli.md#notary) or diff --git a/engine/security/trust/index.md b/engine/security/trust/index.md index 52096d47a6..927b0b379f 100644 --- a/engine/security/trust/index.md +++ b/engine/security/trust/index.md @@ -113,7 +113,7 @@ read how to [manage keys for DCT](trust_key_mng.md). Within the Docker CLI we can sign and push a container image with the `$ docker trust` command syntax. This is built on top of the Notary feature -set, more information on Notary can be found [here](/notary/getting_started/). +set. For more information, see the [Notary](https://github.com/theupdateframework/notary){:target="_blank" rel="noopener" class="_"} GitHub repository. A prerequisite for signing an image is a Docker Registry with a Notary server attached (Such as the Docker Hub ). Instructions for diff --git a/engine/security/trust/trust_automation.md b/engine/security/trust/trust_automation.md index 7b133ed37d..d999f64d1b 100644 --- a/engine/security/trust/trust_automation.md +++ b/engine/security/trust/trust_automation.md @@ -12,7 +12,7 @@ This guide follows the steps as described [here](index.md#signing-images-with-docker-content-trust) so please read that and understand its prerequisites. -When working directly with the Notary client, it uses its [own set of environment variables](../../../notary/reference/client-config.md#environment-variables-optional). +When working directly with the Notary client, it uses its [own set of environment variables](https://github.com/theupdateframework/notary/blob/master/docs/reference/client-config.md#environment-variables-optional){:target="_blank" rel="noopener" class="_"}. ## Add a delegation private key diff --git a/engine/security/trust/trust_delegation.md b/engine/security/trust/trust_delegation.md index d92b9a1c29..a80f8567fb 100644 --- a/engine/security/trust/trust_delegation.md +++ b/engine/security/trust/trust_delegation.md @@ -79,10 +79,9 @@ Failed to add signer to: registry.example.com/user/repo Some of the more advanced features of DCT require the Notary CLI. To install and configure the Notary CLI: -1) Download the [client](https://github.com/theupdateframework/notary/releases) -and ensure that it is available on your path. +1. Download the [client](https://github.com/theupdateframework/notary/releases) and ensure that it is available on your path. -2) Create a configuration file at `~/.notary/config.json` with the following content: +2. Create a configuration file at `~/.notary/config.json` with the following content: ```json { @@ -96,9 +95,9 @@ and ensure that it is available on your path. The newly created configuration file contains information about the location of your local Docker trust data and the notary server URL. -For more detailed information about how to use notary outside of the -Docker Content Trust use cases, refer to the Notary CLI documentation -[here](https://github.com/theupdateframework/notary/blob/master/docs/command_reference.md) +For more detailed information about how to use notary outside of the +Docker Content Trust use cases, refer to the Notary CLI documentation +[here](https://github.com/theupdateframework/notary/blob/master/docs/command_reference.md){:target="_blank" rel="noopener" class="_"} ## Creating Delegation Keys @@ -370,7 +369,7 @@ $ notary witness registry.example.com/admin/demo targets/releases --publish ``` More information on the `$ notary witness` command can be found -[here](https://github.com/theupdateframework/notary/blob/master/docs/advanced_usage.md#recovering-a-delegation) +[here](https://github.com/theupdateframework/notary/blob/master/docs/advanced_usage.md#recovering-a-delegation){:target="_blank" rel="noopener" class="_"} ### Removing a Contributor's Key from a Delegation diff --git a/engine/security/trust/trust_key_mng.md b/engine/security/trust/trust_key_mng.md index 194589d34d..2bc654fb5a 100644 --- a/engine/security/trust/trust_key_mng.md +++ b/engine/security/trust/trust_key_mng.md @@ -31,8 +31,7 @@ workflow. They need to be **Note**: Prior to Docker Engine 1.11, the snapshot key was also generated and stored locally client-side. -Use the Notary CLI to [manage your snapshot key locally again](../../../notary/advanced_usage.md#rotate-keys) -for repositories created with newer versions of Docker. +Use the Notary CLI to [manage your snapshot key locally again](https://github.com/theupdateframework/notary/blob/master/docs/advanced_usage.md#rotate-keys){:target="_blank" rel="noopener" class="_"} for repositories created with newer versions of Docker. ## Choose a passphrase @@ -64,7 +63,7 @@ Docker Content Trust can store and sign with root keys from a Yubikey 4. The Yubikey is prioritized over keys stored in the filesystem. When you initialize a new repository with content trust, Docker Engine looks for a root key locally. If a key is not found and the Yubikey 4 exists, Docker Engine creates a root key in the -Yubikey 4. Consult the [Notary documentation](../../../notary/advanced_usage.md#use-a-yubikey) +Yubikey 4. Consult the [Notary documentation](https://github.com/theupdateframework/notary/blob/master/docs/advanced_usage.md#use-a-yubikey){:target="_blank" rel="noopener" class="_"} for more details. Prior to Docker Engine 1.11, this feature was only in the experimental branch.