From cfd326bfa0456ebb86806974dc524bbab7ec4fae Mon Sep 17 00:00:00 2001
From: David Karlsson <35727626+dvdksn@users.noreply.github.com>
Date: Thu, 24 Oct 2024 17:19:03 +0200
Subject: [PATCH] [DNM] scout: create exceptions in docker desktop (#20797)

Docker Desktop part of #20581, for 4.35

Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
---
 content/manuals/scout/explore/exceptions.md   | 27 ++++++++----
 .../scout/how-tos/create-exceptions-gui.md    | 41 ++++++++++++++-----
 2 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/content/manuals/scout/explore/exceptions.md b/content/manuals/scout/explore/exceptions.md
index f5d45cb039..a654c20d3a 100644
--- a/content/manuals/scout/explore/exceptions.md
+++ b/content/manuals/scout/explore/exceptions.md
@@ -25,15 +25,14 @@ then that CVE is excluded from analysis results.
 To create an exception for an image, you can:
 
 - Create an exception in the [GUI](/manuals/scout/how-tos/create-exceptions-gui.md) of
-  Docker Scout Dashboard.
-
+  Docker Scout Dashboard or Docker Desktop.
 - Create a [VEX](/manuals/scout/how-tos/create-exceptions-vex.md) document and attach
   it to the image.
 
-The recommended way to create exceptions is to use Docker Scout Dashboard. The
-GUI provides a user-friendly interface for creating exceptions. It also lets
-you create exceptions for multiple images, or your entire organization, all at
-once.
+The recommended way to create exceptions is to use Docker Scout Dashboard or
+Docker Desktop. The GUI provides a user-friendly interface for creating
+exceptions. It also lets you create exceptions for multiple images, or your
+entire organization, all at once.
 
 ## View exceptions
 
@@ -46,7 +45,7 @@ To view exceptions for images, you need to have the appropriate permissions.
   are visible to anyone who can pull the image, since the VEX document is
   stored in the image manifest or on filesystem of the image.
 
-### View exceptions in Docker Scout Dashboard
+### View exceptions in Docker Scout Dashboard or Docker Desktop
 
 The [**Exceptions** tab](https://scout.docker.com/reports/vulnerabilities/exceptions)
 of the Vulnerabilities page in Docker Scout Dashboard lists all exceptions for
@@ -59,10 +58,24 @@ selecting the action menu lets you edit or remove the exception.
 
 To view all exceptions for a specific image tag:
 
+{{< tabs >}}
+{{< tab name="Docker Scout Dashboard" >}}
+
 1. Go to the [Images page](https://scout.docker.com/reports/images).
 2. Select the tag that you want to inspect.
 3. Open the **Exceptions** tab.
 
+{{< /tab >}}
+{{< tab name="Docker Desktop" >}}
+
+1. Open the **Images** view in Docker Desktop.
+2. Open the **Hub** tab.
+3. Select the tag you want to inspect.
+4. Open the **Exceptions** tab.
+
+{{< /tab >}}
+{{< /tabs >}}
+
 ### View exceptions in the CLI
 
 {{% experimental %}}
diff --git a/content/manuals/scout/how-tos/create-exceptions-gui.md b/content/manuals/scout/how-tos/create-exceptions-gui.md
index 8d80ab26fb..52567c7ef2 100644
--- a/content/manuals/scout/how-tos/create-exceptions-gui.md
+++ b/content/manuals/scout/how-tos/create-exceptions-gui.md
@@ -1,24 +1,27 @@
 ---
 title: Create an exception using the GUI
-description: Create an exception for a vulnerability in an image using the Docker Scout Dashboard.
-keywords: Docker, Docker Scout, vulnerability, exception, create, GUI
+description: Create an exception for a vulnerability in an image using the Docker Scout Dashboard or Docker Desktop.
+keywords: Docker, Docker Scout, Docker Desktop, vulnerability, exception, create, GUI
 ---
 
-The Docker Scout Dashboard provides a user-friendly interface for creating
-[exceptions](/manuals/scout/explore/exceptions.md) for vulnerabilities found in
-container images. Exceptions let you acknowledge accepted risks or address
-false positives in image analysis.
+The Docker Scout Dashboard and Docker Desktop provide a user-friendly interface
+for creating [exceptions](/manuals/scout/explore/exceptions.md) for
+vulnerabilities found in container images. Exceptions let you acknowledge
+accepted risks or address false positives in image analysis.
 
 ## Prerequisites
 
-To create an in the Docker Scout Dashboard, you need a Docker account with
-**Editor** or **Owner** permissions for the Docker organization that owns the
-image.
+To create an in the Docker Scout Dashboard or Docker Desktop, you need a Docker
+account with **Editor** or **Owner** permissions for the Docker organization
+that owns the image.
 
 ## Steps
 
 To create an exception for a vulnerability in an image using the Docker Scout
-Dashboard:
+Dashboard or Docker Desktop:
+
+{{< tabs >}}
+{{< tab name="Docker Scout Dashboard" >}}
 
 1. Go to the [Images page](https://scout.docker.com/reports/images).
 2. Select the image tag that contains the vulnerability you want to create an
@@ -76,3 +79,21 @@ tab of the [Vulnerabilities page](https://scout.docker.com/reports/vulnerabiliti
 in the Docker Scout Dashboard.
 
 {{% /create_panel.inline %}}
+
+{{< /tab >}}
+{{< tab name="Docker Desktop" >}}
+
+1. Open the **Images** view in Docker Desktop.
+2. Open the **Hub** tab.
+3. Select the image tag that contains the vulnerability you want to create an
+   exception for.
+4. Select the layer that contains the vulnerability you want to create an
+   exception for.
+5. In the **Vulnerabilities** tab, find the vulnerability you want to create an
+   exception for.
+6. Select the **Create exception** button next to the vulnerability.
+
+{{% create_panel.inline / %}}
+
+{{< /tab >}}
+{{< /tabs >}}