Sync from docker/docs@e367017 by PCIT

khs1994-website · Jan 30, 2024 · dcfc256 · dcfc256
1 parent e4782d0
commit dcfc256
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 20 deletions.
diff --git a/content/compose/compose-file/13-merge.md b/content/compose/compose-file/13-merge.md
@@ -180,4 +180,28 @@ services:
     read_only: false
     environment: {}
     ports: []
-```
+```
+
+### Replace value
+
+While `!reset` can be used to remove a declaration from a Compose file using an override file, `!override` allows you 
+to fully replace an attribute, bypassing the standard merge rules. A typical example is to fully replace a resource definition, to rely on a distinct model but using the same name.
+
+Merging the following example YAML trees:
+
+```yaml
+networks:
+  foo:
+    # this is production configuration
+    name: production-overlay-network
+    driver: overlay
+    driver-opts: (...)
+```
+
+```yaml
+networks:
+  # this is development configuration
+  foo: !override {}
+```
+
+Results in a Compose application model equivalent to the override YAML tree.
diff --git a/content/compose/gettingstarted.md b/content/compose/gettingstarted.md
@@ -89,7 +89,7 @@ In your project directory, create a file named `Dockerfile` and paste the follow
 
 ```dockerfile
 # syntax=docker/dockerfile:1
-FROM python:3.7-alpine
+FROM python:3.10-alpine
 WORKDIR /code
 ENV FLASK_APP=app.py
 ENV FLASK_RUN_HOST=0.0.0.0
@@ -351,4 +351,4 @@ $ docker compose down --volumes
 - Try the [Sample apps with Compose](https://github.com/docker/awesome-compose)
 - [Explore the full list of Compose commands](reference/index.md)
 - [Explore the Compose file reference](compose-file/index.md)
-- To learn more about volumes and bind mounts, see [Manage data in Docker](../storage/index.md)
+- To learn more about volumes and bind mounts, see [Manage data in Docker](../storage/index.md)
diff --git a/content/scout/integrations/_index.md b/content/scout/integrations/_index.md
@@ -25,7 +25,7 @@ The following container registry integrations are available:
 
 - [Artifactory](./registry/artifactory.md)
 - [Amazon Elastic Container Registry](./registry/ecr.md)
-- [Azure Container Registry](./registry/acr.md) {{< badge color=violet text="Early Access" >}}
+- [Azure Container Registry](./registry/acr.md)
 
 ### Continuous Integration
 

diff --git a/content/scout/integrations/registry/acr.md b/content/scout/integrations/registry/acr.md
@@ -4,11 +4,6 @@ keywords: docker scout, acr, azure, integration, image analysis, security, cves
 title: Azure Container Registry integration
 ---
 
-> **Early Access feature**
->
-> The Azure Container Registry (ACR) integration is currently in [Early Access](../../../release-lifecycle.md#early-access-ea).
-{ .experimental }
-
 Integrating Docker Scout with Azure Container Registry (ACR) lets you view
 image insights for images hosted in ACR repositories. After integrating Docker
 Scout with ACR and activating Docker Scout for a repository, pushing an image

diff --git a/content/scout/release-notes.md b/content/scout/release-notes.md
@@ -12,6 +12,15 @@ the `docker/scout-cli` [GitHub repository](https://github.com/docker/scout-cli/r
 Take a look at the [Docker Public Roadmap](https://github.com/docker/roadmap/projects/1)
 for what's coming next.
 
+## 2024-01-26
+
+**Azure Container Registry** integration graduated from
+[Early Access](../release-lifecycle.md#early-access-ea) to
+[General Availability](../release-lifecycle.md#genera-availability-ga).
+
+For more information and setup instructions, see
+[Integrate Azure Container Registry](./integrations/registry/acr.md).
+
 ## 2024-01-23
 
 New **Unapproved base images** policy, which lets you restrict which base

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -5,19 +5,19 @@
   {{ partial "head.html" . }}
 </head>
 
-<body class="min-w-fit bg-background-light text-base dark:bg-background-dark dark:text-white">
+<body class="bg-background-light text-base dark:bg-background-dark dark:text-white">
   {{ partial "header.html" . }}
-  <main class="grid grid-cols-main md:flex xl:grid-cols-main-xl">
+  <main class="flex">
     <div id="sidebar"
-      class="sticky top-16 h-[calc(100lvh-theme(space.16))] overflow-y-scroll flex flex-row-reverse bg-background-light dark:bg-gray-dark-100 md:fixed md:z-10 md:hidden md:h-screen md:w-screen">
+      class="sticky top-16 flex h-screen shrink-0 grow flex-row-reverse overflow-y-scroll bg-background-light dark:bg-gray-dark-100 md:fixed md:z-10 md:hidden md:h-screen md:w-screen lg:grow-0">
       {{ block "left" . }}
       {{ end }}
     </div>
-    <div class="p-6 pt-0 md:w-screen overflow-clip">
+    <div class="w-[840px] flex-initial overflow-clip p-6 pt-0 md:w-lvw">
       {{ block "main" . }}
       {{ end }}
     </div>
-    <div class="sticky top-16 h-[calc(100lvh-theme(space.16))] overflow-y-scroll lg:hidden">
+    <div class="sticky top-16 h-screen w-[300px] shrink grow overflow-y-scroll lg:hidden">
       {{ block "right" . }}
       {{ end }}
     </div>

diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html
@@ -8,11 +8,11 @@
       {{- if $i -}}
         <span>/</span>
       {{- end -}}
-      <a href="{{ $e.path }}" class="link whitespace-nowrap overflow-hidden overflow-ellipsis">{{ markdownify $e.title }}</a>
+      <a href="{{ $e.path }}" class="link truncate">{{ markdownify $e.title }}</a>
     {{- end -}}
   {{- end -}}
   {{- with $scratch.Get "lastsection" -}}
   <span>/</span>
-  <span class="shrink-0">{{ markdownify .title }}</span>
+  <span class="truncate">{{ markdownify .title }}</span>
   {{- end -}}
 </nav>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
@@ -1,6 +1,7 @@
 <header class="sticky top-0 z-20 h-16 px-4 text-white bg-gradient-to-r from-accent-light to-blue-light-500 dark:from-accent-dark dark:to-blue-dark-100">
   <div class="mx-auto flex h-full max-w-[1400px] items-center justify-between">
     <div class="flex h-full items-center gap-8 md:gap-2">
+      {{ if not .IsHome }}
       <button x-data tabindex="4" @click="() => {
       $store.showSidebar = ! $store.showSidebar;
       const sidebar = document.querySelector('#sidebar');
@@ -12,6 +13,7 @@
       }" class="icon-svg hidden px-4 md:block" aria-label="Menu">
         {{ partial "icon" "menu" }}
       </button>
+      {{ end }}
       <div>
         {{/* main logo */}}
         <a href="{{ site.BaseURL }}">

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -4,10 +4,6 @@ module.exports = {
   darkMode: "class",
   theme: {
     extend: {
-      gridTemplateColumns: {
-        "main": 'minmax(300px, 1fr) 840px minmax(300px, 1fr)',
-        "main-xl": '300px 840px minmax(0, 1fr)',
-      },
       typography: (theme) => ({
         DEFAULT: {
           css: {