diff --git a/content/compose/compose-file/13-merge.md b/content/compose/compose-file/13-merge.md index 06d6cafb9..e8b9b913a 100644 --- 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: [] -``` \ No newline at end of file +``` + +### 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. \ No newline at end of file diff --git a/content/compose/gettingstarted.md b/content/compose/gettingstarted.md index c7913a409..64fbb7d05 100644 --- 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) \ No newline at end of file +- 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 index 4cb4924cf..0aa993046 100644 --- 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 index bf85e8329..80ede693a 100644 --- 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 index 7034ed358..30ea4d1ab 100644 --- 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 index a0af34fa7..181426784 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -5,19 +5,19 @@ {{ partial "head.html" . }} - + {{ partial "header.html" . }} -
+
-
+
{{ block "main" . }} {{ end }}
-
+
{{ block "right" . }} {{ end }}
diff --git a/layouts/partials/breadcrumbs.html b/layouts/partials/breadcrumbs.html index 1f177665e..e7077aa3a 100644 --- a/layouts/partials/breadcrumbs.html +++ b/layouts/partials/breadcrumbs.html @@ -8,11 +8,11 @@ {{- if $i -}} / {{- end -}} - {{ markdownify $e.title }} + {{ markdownify $e.title }} {{- end -}} {{- end -}} {{- with $scratch.Get "lastsection" -}} / - {{ markdownify .title }} + {{ markdownify .title }} {{- end -}} diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 62d21834e..6dc7ddbae 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,6 +1,7 @@
+ {{ if not .IsHome }} + {{ end }}