From 6e131c36a7ae9a7862f2c09fd6cf0c8800873061 Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Tue, 5 Oct 2021 11:39:27 +0100 Subject: [PATCH 1/2] Fix a broken link Signed-off-by: Usha Mandya --- desktop/windows/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/windows/release-notes.md b/desktop/windows/release-notes.md index 9538fef03b..7f07656a34 100644 --- a/desktop/windows/release-notes.md +++ b/desktop/windows/release-notes.md @@ -55,7 +55,7 @@ This page contains information about the new features, improvements, known issue ### Known Issue -Docker Desktop may fail to start when upgrading to 4.1.0 on some WSL-based distributions such as ArchWSL. See [docker/for-win#12229](https://github.com/docker/for-win/issues/12229.) +Docker Desktop may fail to start when upgrading to 4.1.0 on some WSL-based distributions such as ArchWSL. See [docker/for-win#12229](https://github.com/docker/for-win/issues/12229) ## Docker Desktop 4.0.1 2021-09-13 From 99e546358f5f387879d926b231ebeb8be2eefb10 Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Tue, 5 Oct 2021 15:18:22 +0100 Subject: [PATCH 2/2] Add CTAs to the Docs pages Signed-off-by: Usha Mandya --- desktop/windows/install.md | 5 +++++ engine/install/ubuntu.md | 5 +++++ get-docker.md | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/desktop/windows/install.md b/desktop/windows/install.md index 4178cbd2e5..3363659da7 100644 --- a/desktop/windows/install.md +++ b/desktop/windows/install.md @@ -12,6 +12,11 @@ redirect_from: - /install/windows/ee-preview/ --- +> **Update to the Docker Desktop terms** +> +> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022, for those that require a paid subscription. For more information, see [Docker Desktop License Agreement](../../subscription/index.md#docker-desktop-license-agreement). +{: .important} + Welcome to Docker Desktop for Windows. This page contains information about Docker Desktop for Windows system requirements, download URL, instructions to install and update Docker Desktop for Windows. > Download Docker Desktop for Windows diff --git a/engine/install/ubuntu.md b/engine/install/ubuntu.md index eb08334052..57cfcc5473 100644 --- a/engine/install/ubuntu.md +++ b/engine/install/ubuntu.md @@ -16,6 +16,11 @@ title: Install Docker Engine on Ubuntu toc_max: 4 --- +> **Scan your images for vulnerabilities** +> +> Using open source components in your container images can introduce vulnerabilities. Run `docker scan` to start securing your images using Snyk. If you have a Docker Pro, Team, or a Business subscription, you can automatically scan images when you push an image to Docker Hub. See [Hub Vulnerability Scanning](../../docker-hub/vulnerability-scanning.md) for more information. +{: .important} + To get started with Docker Engine on Ubuntu, make sure you [meet the prerequisites](#prerequisites), then [install Docker](#installation-methods). diff --git a/get-docker.md b/get-docker.md index 23c9c72a12..d49cb8bbd0 100644 --- a/get-docker.md +++ b/get-docker.md @@ -8,6 +8,10 @@ redirect_from: - /installation/ --- +> **Update to the Docker Desktop terms** +> +> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022, for those that require a paid subscription. For more information, see the blog [Docker is Updating and Extending Our Product Subscriptions](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}. +{: .important} Docker is an open platform for developing, shipping, and running applications. Docker enables you to separate your applications from your infrastructure so you