From 5009ea3d20ddcc65656060348185832b3eb1eef8 Mon Sep 17 00:00:00 2001 From: aevesdocker Date: Tue, 6 Feb 2024 15:26:55 +0000 Subject: [PATCH 1/2] ENGDOCS-1977 --- content/desktop/get-started.md | 4 ++++ content/desktop/install/linux-install.md | 5 +++-- content/desktop/install/mac-install.md | 5 +++-- content/desktop/install/windows-install.md | 5 +++-- content/docker-hub/quickstart.md | 6 +++++- content/docker-id/_index.md | 6 +++++- content/get-docker.md | 6 ++++++ content/subscription/desktop-license.md | 6 +++++- 8 files changed, 34 insertions(+), 9 deletions(-) diff --git a/content/desktop/get-started.md b/content/desktop/get-started.md index ef5ecd8a55ad..fa5db5dcbf49 100644 --- a/content/desktop/get-started.md +++ b/content/desktop/get-started.md @@ -33,6 +33,10 @@ Docker recommends that you authenticate using the **Sign in** option in the top- In large enterprises where admin access is restricted, administrators can [Configure registry.json to enforce sign-in](../security/for-admins/configure-sign-in.md). +> **Tip** +> +> Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what else Docker can offer you. + ## Benefits of signing in - You can access your Docker Hub repositories directly from Docker Desktop. diff --git a/content/desktop/install/linux-install.md b/content/desktop/install/linux-install.md index 827923037844..5f2f8bbe221c 100644 --- a/content/desktop/install/linux-install.md +++ b/content/desktop/install/linux-install.md @@ -202,8 +202,8 @@ Sign out and sign back in so that your group membership is re-evaluated. > **Docker Desktop terms** > > Commercial use of Docker Desktop in larger enterprises (more than 250 -> employees OR more than $10 million USD in annual revenue) requires a paid -> subscription. +> employees OR more than $10 million USD in annual revenue) requires a [paid +> subscription](https://www.docker.com/pricing/). > **Important** > @@ -232,6 +232,7 @@ Sign out and sign back in so that your group membership is re-evaluated. ## Where to go next +- Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what Docker can offer you. - [Get started with Docker](../../guides/get-started/_index.md). - [Explore Docker Desktop](../use-desktop/index.md) and all its features. - [Troubleshooting](../troubleshoot/overview.md) describes common problems, workarounds, how to run and submit diagnostics, and submit issues. diff --git a/content/desktop/install/mac-install.md b/content/desktop/install/mac-install.md index 211aad0f38d8..7c4e8ea0791f 100644 --- a/content/desktop/install/mac-install.md +++ b/content/desktop/install/mac-install.md @@ -25,8 +25,8 @@ This page contains download URLs, information about system requirements, and ins > **Docker Desktop terms** > > Commercial use of Docker Desktop in larger enterprises (more than 250 -> employees OR more than $10 million USD in annual revenue) requires a paid -> subscription. +> employees OR more than $10 million USD in annual revenue) requires a [paid +> subscription](https://www.docker.com/pricing/). ## System requirements @@ -122,6 +122,7 @@ The `install` command accepts the following flags: ## Where to go next +- Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what Docker can offer you. - [Get started with Docker](../../guides/get-started/_index.md). - [Explore Docker Desktop](../use-desktop/index.md) and all its features. - [Troubleshooting](../troubleshoot/overview.md) describes common problems, workarounds, how diff --git a/content/desktop/install/windows-install.md b/content/desktop/install/windows-install.md index 09f50f0871e4..1a5833d7ea91 100644 --- a/content/desktop/install/windows-install.md +++ b/content/desktop/install/windows-install.md @@ -28,8 +28,8 @@ _For checksums, see [Release notes](../release-notes.md)_ > **Docker Desktop terms** > > Commercial use of Docker Desktop in larger enterprises (more than 250 -> employees OR more than $10 million USD in annual revenue) requires a paid -> subscription. +> employees OR more than $10 million USD in annual revenue) requires a [paid +> subscription](https://www.docker.com/pricing/). ## System requirements @@ -252,6 +252,7 @@ Docker Desktop does not start automatically after installation. To start Docker ## Where to go next +- Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what Docker can offer you. - [Get started with Docker](../../guides/get-started/_index.md). - [Explore Docker Desktop](../use-desktop/index.md) and all its features. - [Troubleshooting](../troubleshoot/overview.md) describes common problems, workarounds, and diff --git a/content/docker-hub/quickstart.md b/content/docker-hub/quickstart.md index 6116ffcfa523..e40182d9fff1 100644 --- a/content/docker-hub/quickstart.md +++ b/content/docker-hub/quickstart.md @@ -79,12 +79,16 @@ aliases: The following section contains step-by-step instructions on how to get started with Docker Hub. -### Step 1: Sign up for a Docker account +### Step 1: Sign up for a free Docker account Start by creating a [Docker ID](https://hub.docker.com/signup). A [Docker ID](../docker-id/_index.md) grants you access to Docker Hub repositories and lets you explore available images from the community and verified publishers. You also need a Docker ID to share images on Docker Hub. +> **Tip** +> +> Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what else Docker can offer you. + ### Step 2: Create your first repository To create a repository: diff --git a/content/docker-id/_index.md b/content/docker-id/_index.md index d2224085204d..c6d528316f00 100644 --- a/content/docker-id/_index.md +++ b/content/docker-id/_index.md @@ -8,10 +8,14 @@ aliases: - /docker-hub/accounts/ --- -You can create a Docker account with your email address or by signing up with your Google or GitHub account. Once you've created your account with a unique Docker ID, you can access all Docker products, including Docker Hub. With Docker Hub, you can access repositories and explore images that are available from the community and verified publishers. +You can create a free Docker account with your email address or by signing up with your Google or GitHub account. Once you've created your account with a unique Docker ID, you can access all Docker products, including Docker Hub. With Docker Hub, you can access repositories and explore images that are available from the community and verified publishers. Your Docker ID becomes your username for hosted Docker services, and [Docker forums](https://forums.docker.com/). +> **Tip** +> +> Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what else Docker can offer you. + ## Create a Docker ID ### Sign up with your email address diff --git a/content/get-docker.md b/content/get-docker.md index 8a8e7cec0f30..7f171f48b201 100644 --- a/content/get-docker.md +++ b/content/get-docker.md @@ -23,6 +23,12 @@ significantly reduce the delay between writing code and running it in production You can download and install Docker on multiple platforms. Refer to the following section and choose the best installation path for you. +> **Docker Desktop terms** +> +> Commercial use of Docker Desktop in larger enterprises (more than 250 +> employees OR more than $10 million USD in annual revenue) requires a [paid +> subscription](https://www.docker.com/pricing/). + {{< card title="Docker Desktop for Mac" description="A native application using the macOS sandbox security model that delivers all Docker tools to your Mac." diff --git a/content/subscription/desktop-license.md b/content/subscription/desktop-license.md index db82b3839258..2942617d53dd 100644 --- a/content/subscription/desktop-license.md +++ b/content/subscription/desktop-license.md @@ -22,4 +22,8 @@ Read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/) and Docker Desktop is built using open-source software. For information about the licensing of open-source components in Docker Desktop, select {{< inline-image src="../desktop/mac/images/whale-x.svg" alt="whale menu" >}} > **About Docker Desktop** > **Acknowledgements**. Docker Desktop distributes some components that are licensed under the -GNU General Public License. Select [here](https://download.docker.com/opensource/License.tar.gz) to download the source for these components. \ No newline at end of file +GNU General Public License. Select [here](https://download.docker.com/opensource/License.tar.gz) to download the source for these components. + +> **Tip** +> +> Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what else Docker can offer you. \ No newline at end of file From 404701581b8de314516de9d0a961b496b3811b96 Mon Sep 17 00:00:00 2001 From: aevesdocker Date: Tue, 6 Feb 2024 15:30:42 +0000 Subject: [PATCH 2/2] fix callout --- content/docker-hub/quickstart.md | 1 + content/docker-id/_index.md | 1 + content/subscription/desktop-license.md | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/content/docker-hub/quickstart.md b/content/docker-hub/quickstart.md index e40182d9fff1..0d6869b0a3c8 100644 --- a/content/docker-hub/quickstart.md +++ b/content/docker-hub/quickstart.md @@ -88,6 +88,7 @@ A [Docker ID](../docker-id/_index.md) grants you access to Docker Hub repositori > **Tip** > > Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what else Docker can offer you. +{ .tip } ### Step 2: Create your first repository diff --git a/content/docker-id/_index.md b/content/docker-id/_index.md index c6d528316f00..208be1b18f04 100644 --- a/content/docker-id/_index.md +++ b/content/docker-id/_index.md @@ -15,6 +15,7 @@ Your Docker ID becomes your username for hosted Docker services, and [Docker for > **Tip** > > Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what else Docker can offer you. +{ .tip } ## Create a Docker ID diff --git a/content/subscription/desktop-license.md b/content/subscription/desktop-license.md index 2942617d53dd..2ff7d0d8d883 100644 --- a/content/subscription/desktop-license.md +++ b/content/subscription/desktop-license.md @@ -26,4 +26,5 @@ GNU General Public License. Select [here](https://download.docker.com/opensource > **Tip** > -> Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what else Docker can offer you. \ No newline at end of file +> Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what else Docker can offer you. +{ .tip } \ No newline at end of file