docker · dvdksn · Oct 9, 2024 · Oct 8, 2024 · Oct 8, 2024 · Oct 8, 2024
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,11 @@
-# syntax=docker/dockerfile-upstream:master
+# syntax=docker/dockerfile:1
 # check=skip=InvalidBaseImagePlatform
 
 # ALPINE_VERSION sets the Alpine Linux version for all Alpine stages
 ARG ALPINE_VERSION=3.20
 # GO_VERSION sets the Go version for the base stage
 ARG GO_VERSION=1.23
-# HTML_TEST_VERSION sets the wjdp/htmltest version for HTML testing
+# HTMLTEST_VERSION sets the wjdp/htmltest version for HTML testing
 ARG HTMLTEST_VERSION=0.17.0
 
 # base is the base stage with build dependencies

diff --git a/content/get-started/introduction/develop-with-containers.md b/content/get-started/introduction/develop-with-containers.md
@@ -79,32 +79,25 @@ With this environment up and running, you’re ready to make a few changes to th
 
 The greeting at the top of the page is populated by an API call at `/api/greeting`. Currently, it always returns "Hello world!". You’ll now modify it to return one of three randomized messages (that you'll get to choose).
 
-1. Open the `backend/src/routes/getGreeting.js` file. This file provides the handler for the API endpoint.
+1. Open the `backend/src/routes/getGreeting.js` file in a text editor. This file provides the handler for the API endpoint.
 
-2. Modify the variable at the top to an array of greetings. Feel free to use the following modifications or customize it to your own liking.
+2. Modify the variable at the top to an array of greetings. Feel free to use the following modifications or customize it to your own liking. Also, update the endpoint to send a random greeting from this list.
 
-    ```js {linenos=table,hl_lines=["1-5"],linenostart=1}
+    ```js {linenos=table,hl_lines=["1-5",9],linenostart=1}
     const GREETINGS = [
         "Whalecome!",
         "All hands on deck!",
         "Charting the course ahead!",
     ];
 
-    module.exports = async (req, res) => {
-    ...
-    ```
-
-3. Now, update the endpoint to send a random greeting from this list by making the following change:
-
-    ```js {linenos=table,hl_lines=[3],linenostart=7}
     module.exports = async (req, res) => {
         res.send({
             greeting: GREETINGS[ Math.floor( Math.random() * GREETINGS.length )],
         });
     };
     ```
 
-4. If you haven't done so yet, save the file. If you refresh your browser, you should see a new greeting. If you keep refreshing, you should see all of the messages appear.
+3. If you haven't done so yet, save the file. If you refresh your browser, you should see a new greeting. If you keep refreshing, you should see all of the messages appear.
 
     ![Screenshot of the to-do app with a new greeting](images/develop-app-with-greetings.webp)
 

diff --git a/content/guides/databases.md b/content/guides/databases.md
@@ -696,4 +696,4 @@ Related information:
 - [Dockerfile reference](/reference/dockerfile/)
 - [Compose file reference](/reference/compose-file/)
 - [CLI reference](/reference/cli/docker/)
-- [Database samples](../../samples/_index.md#databases)
+- [Database samples](../../reference/samples/_index.md#databases)
diff --git a/content/guides/docker-scout/_index.md b/content/guides/docker-scout/_index.md
@@ -29,24 +29,23 @@ params:
 
 When container images are insecure, significant risks can arise. Around 60% of
 organizations have reported experiencing at least one security breach or
-vulnerability incident within a year, resulting in operational
-disruption.[^CSA] These incidents often result in considerable downtime, with
+vulnerability incident within a year, [resulting in operational
+disruption][CSA]. These incidents often result in considerable downtime, with
 44% of affected companies experiencing over an hour of downtime per event. The
-financial impact is substantial, with the average data breach cost reaching
-$4.45 million.[^IBM] This highlights the critical importance of maintaining
+financial impact is substantial, with [the average data breach cost reaching
+$4.45 million][IBM]. This highlights the critical importance of maintaining
 robust container security measures.
 
 Docker Scout enhances container security by providing automated vulnerability
 detection and remediation, addressing insecure container images, and ensuring
 compliance with security standards.
 
-[^CSA]: https://cloudsecurityalliance.org/blog/2023/09/21/2023-global-cloud-threat-report-cloud-attacks-are-lightning-fast
-
-[^IBM]: https://www.ibm.com/reports/data-breach
+[CSA]: https://cloudsecurityalliance.org/blog/2023/09/21/2023-global-cloud-threat-report-cloud-attacks-are-lightning-fast
+[IBM]: https://www.ibm.com/reports/data-breach
 
 ## What you'll learn
 
-- Define secure software supply chain (SSSC)
+- Define Secure Software Supply Chain (SSSC)
 - Review SBOMs and how to use them
 - Detect and monitor vulnerabilities
 

diff --git a/content/guides/docker-scout/demo.md b/content/guides/docker-scout/demo.md
@@ -1,6 +1,6 @@
 ---
 title: Docker Scout demo
-description: Learn about Docke rScout's powerful features for enhanced supply chain security.
+description: Learn about Docker Scout's powerful features for enhanced supply chain security.
 weight: 20
 ---
 

@@ -29,7 +29,7 @@ grid:
     description: |
       The web interface for Docker Scout.
     icon: dashboard
-  - title: Policy {{< badge color=violet text="Early Access" >}}
+  - title: Policy
     link: /scout/policy/
     description: |
       Ensure that your artifacts align with supply chain best practices.

@@ -9,11 +9,6 @@ description: |
   requirements over time
 ---
 
-{{% restricted title="Early Access" %}}
-Policy Evaluation is an [Early Access](/release-lifecycle/#early-access-ea)
-feature of Docker Scout.
-{{% /restricted %}}
-
 In software supply chain management, maintaining the security and reliability
 of artifacts is a top priority. Policy Evaluation in Docker Scout introduces a
 layer of control, on top of existing analysis capabilities. It lets you define

@@ -31,9 +31,9 @@ To add a policy:
 1. Go to the [Policies page](https://scout.docker.com/reports/policy) in the Docker Scout Dashboard.
 2. Select the **Add policy** button to open the policy configuration screen.
 3. On the policy configuration screen, locate the policy type that you want to
-   configure, and select **Configure** to open the policy configuration panel.
+   configure, and select **Configure** to open the policy configuration page.
 
-   - If the **Configure** button is grayed out, it means the selected policy
+   - If the **Configure** button is grayed out, it means the current policy
      has no configurable parameters.
    - If the button reads **Integrate**, it indicates that setup is required
      before the policy can be enabled. Selecting **Integrate** will direct you
@@ -42,11 +42,25 @@ To add a policy:
 4. Update the policy parameters.
 5. Save the changes:
 
-   - Select **Save and enable** to commit the changes and enable the policy for
+   - Select **Save policy** to commit the changes and enable the policy for
      your current organization.
-   - Select **Save policy** to save the policy configuration without enabling
+   - Select **Save and disable** to save the policy configuration without enabling
      it.
 
+## Edit a policy
+
+Editing a policy lets you to modify its configuration without creating 
+a new one from scratch. This can be useful when policy parameters need adjustments 
+due to evolving requirements or changes in your organization's compliance goals.
+
+To edit a policy:
+
+1. Go to the [Policies page](https://scout.docker.com/reports/policy) in the Docker Scout Dashboard.
+2. Select the policy you want to edit.
+3. Select the **Edit** button.
+4. Update the policy parameters.
+5. Save the changes.
+
 ## Disable a policy
 
 When you disable a policy, evaluation results for that policy are hidden, and
@@ -70,8 +84,7 @@ To delete a policy:
 
 1. Go to the [Policies page](https://scout.docker.com/reports/policy) in the Docker Scout Dashboard.
 2. Select the policy you want to delete.
-3. Select **View policy details**.
-4. Select the **Delete** button.
+3. Select the **Delete** button.
 
 ## Recover a deleted policy
 

@@ -6,11 +6,6 @@ description: |
 keywords: scout, policy, status, vulnerabilities, supply chain, cves, licenses
 ---
 
-{{% restricted title="Earyl Access" %}}
-Policy Evaluation is an [Early Access](/release-lifecycle/#early-access-ea)
-feature of Docker Scout.
-{{% /restricted %}}
-
 You can track policy status for your artifacts from the [Docker Scout
 Dashboard](#dashboard), or using the [CLI](#cli).
 

@@ -18,6 +18,22 @@ Docker Scout platform, including the Dashboard. For CLI release notes, refer to
 Take a look at the [Docker Public Roadmap](https://github.com/docker/roadmap/projects/1)
 for what's coming next.
 
+## Q4 2024
+
+New features and enhancements released in the fourth quarter of 2024.
+
+### 2024-10-09
+
+Policy Evaluation has graduated form Early Access to General Availability.
+
+Docker Scout Dashboard UI changes:
+
+- On the Docker Scout Dashboard, selecting a policy card now opens the policy
+  details page instead of the policy results page.
+- The policy results page and the policy details side panel are now read-only.
+  Policy actions (edit, disable, delete) are now accessible from the policy
+  details page.
+
 ## Q3 2024
 
 New features and enhancements released in the third quarter of 2024.

diff --git a/content/samples/_index.md → content/reference/samples/_index.md b/content/samples/_index.md → content/reference/samples/_index.md
@@ -1,9 +1,11 @@
 ---
+linkTitle: Samples
 title: Samples overview
 description: Learn how to containerize different types of services by walking through
   Official Docker samples.
 cascade:
   layout: samples
+  type: samples
 aliases:
 - /en/latest/examples/
 - /engine/examples/

diff --git a/content/samples/ai-ml.md → content/reference/samples/ai-ml.md b/content/samples/ai-ml.md → content/reference/samples/ai-ml.md
diff --git a/content/samples/angular.md → content/reference/samples/angular.md b/content/samples/angular.md → content/reference/samples/angular.md
diff --git a/content/samples/cloudflared.md → content/reference/samples/cloudflared.md b/content/samples/cloudflared.md → content/reference/samples/cloudflared.md
diff --git a/content/samples/django.md → content/reference/samples/django.md b/content/samples/django.md → content/reference/samples/django.md
diff --git a/content/samples/dotnet.md → content/reference/samples/dotnet.md b/content/samples/dotnet.md → content/reference/samples/dotnet.md
diff --git a/content/samples/elasticsearch.md → content/reference/samples/elasticsearch.md b/content/samples/elasticsearch.md → content/reference/samples/elasticsearch.md
diff --git a/content/samples/express.md → content/reference/samples/express.md b/content/samples/express.md → content/reference/samples/express.md
diff --git a/content/samples/fastapi.md → content/reference/samples/fastapi.md b/content/samples/fastapi.md → content/reference/samples/fastapi.md
diff --git a/content/samples/flask.md → content/reference/samples/flask.md b/content/samples/flask.md → content/reference/samples/flask.md
diff --git a/content/samples/gitea.md → content/reference/samples/gitea.md b/content/samples/gitea.md → content/reference/samples/gitea.md
diff --git a/content/samples/go.md → content/reference/samples/go.md b/content/samples/go.md → content/reference/samples/go.md
diff --git a/content/samples/java.md → content/reference/samples/java.md b/content/samples/java.md → content/reference/samples/java.md
diff --git a/content/samples/javascript.md → content/reference/samples/javascript.md b/content/samples/javascript.md → content/reference/samples/javascript.md
diff --git a/content/samples/mariadb.md → content/reference/samples/mariadb.md b/content/samples/mariadb.md → content/reference/samples/mariadb.md
diff --git a/content/samples/minecraft.md → content/reference/samples/minecraft.md b/content/samples/minecraft.md → content/reference/samples/minecraft.md
diff --git a/content/samples/mongodb.md → content/reference/samples/mongodb.md b/content/samples/mongodb.md → content/reference/samples/mongodb.md
diff --git a/content/samples/ms-sql.md → content/reference/samples/ms-sql.md b/content/samples/ms-sql.md → content/reference/samples/ms-sql.md
diff --git a/content/samples/mysql.md → content/reference/samples/mysql.md b/content/samples/mysql.md → content/reference/samples/mysql.md
diff --git a/content/samples/nextcloud.md → content/reference/samples/nextcloud.md b/content/samples/nextcloud.md → content/reference/samples/nextcloud.md
diff --git a/content/samples/nginx.md → content/reference/samples/nginx.md b/content/samples/nginx.md → content/reference/samples/nginx.md
diff --git a/content/samples/nodejs.md → content/reference/samples/nodejs.md b/content/samples/nodejs.md → content/reference/samples/nodejs.md
diff --git a/content/samples/php.md → content/reference/samples/php.md b/content/samples/php.md → content/reference/samples/php.md
diff --git a/content/samples/pi-hole.md → content/reference/samples/pi-hole.md b/content/samples/pi-hole.md → content/reference/samples/pi-hole.md
diff --git a/content/samples/plex.md → content/reference/samples/plex.md b/content/samples/plex.md → content/reference/samples/plex.md
diff --git a/content/samples/portainer.md → content/reference/samples/portainer.md b/content/samples/portainer.md → content/reference/samples/portainer.md
diff --git a/content/samples/postgres.md → content/reference/samples/postgres.md b/content/samples/postgres.md → content/reference/samples/postgres.md
diff --git a/content/samples/prometheus.md → content/reference/samples/prometheus.md b/content/samples/prometheus.md → content/reference/samples/prometheus.md
diff --git a/content/samples/python.md → content/reference/samples/python.md b/content/samples/python.md → content/reference/samples/python.md
diff --git a/content/samples/rails.md → content/reference/samples/rails.md b/content/samples/rails.md → content/reference/samples/rails.md
diff --git a/content/samples/react.md → content/reference/samples/react.md b/content/samples/react.md → content/reference/samples/react.md
diff --git a/content/samples/redis.md → content/reference/samples/redis.md b/content/samples/redis.md → content/reference/samples/redis.md
diff --git a/content/samples/ruby.md → content/reference/samples/ruby.md b/content/samples/ruby.md → content/reference/samples/ruby.md
diff --git a/content/samples/rust.md → content/reference/samples/rust.md b/content/samples/rust.md → content/reference/samples/rust.md
diff --git a/content/samples/spark.md → content/reference/samples/spark.md b/content/samples/spark.md → content/reference/samples/spark.md
diff --git a/content/samples/spring.md → content/reference/samples/spring.md b/content/samples/spring.md → content/reference/samples/spring.md
diff --git a/content/samples/traefik.md → content/reference/samples/traefik.md b/content/samples/traefik.md → content/reference/samples/traefik.md
diff --git a/content/samples/typescript.md → content/reference/samples/typescript.md b/content/samples/typescript.md → content/reference/samples/typescript.md
diff --git a/content/samples/vuejs.md → content/reference/samples/vuejs.md b/content/samples/vuejs.md → content/reference/samples/vuejs.md
diff --git a/content/samples/wireguard.md → content/reference/samples/wireguard.md b/content/samples/wireguard.md → content/reference/samples/wireguard.md
diff --git a/content/samples/wordpress.md → content/reference/samples/wordpress.md b/content/samples/wordpress.md → content/reference/samples/wordpress.md