From aa829858b5e0ceed75097d15fbe1bfba2a4f8c0e Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Wed, 22 Nov 2023 16:08:49 +0100 Subject: [PATCH] chore: mv wasm and containerd pages Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> --- content/build/attestations/_index.md | 2 +- content/desktop/{containerd/_index.md => containerd.md} | 8 ++++---- content/desktop/release-notes.md | 4 ++-- content/desktop/{wasm/_index.md => wasm.md} | 6 +++--- content/scout/image-analysis.md | 2 +- content/scout/sbom.md | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) rename content/desktop/{containerd/_index.md => containerd.md} (96%) rename content/desktop/{wasm/_index.md => wasm.md} (96%) diff --git a/content/build/attestations/_index.md b/content/build/attestations/_index.md index b2ed9e69399..7abc7c2a06b 100644 --- a/content/build/attestations/_index.md +++ b/content/build/attestations/_index.md @@ -58,7 +58,7 @@ $ docker buildx build --sbom=true --provenance=true . > > - Use a `docker-container` driver with the `--push` flag to push the image to > a registry directly. -> - Enable the [containerd image store](../../desktop/containerd/_index.md). +> - Enable the [containerd image store](../../desktop/containerd.md). > **Note** > diff --git a/content/desktop/containerd/_index.md b/content/desktop/containerd.md similarity index 96% rename from content/desktop/containerd/_index.md rename to content/desktop/containerd.md index 1e5a8f8dff4..bb2a9603a4f 100644 --- a/content/desktop/containerd/_index.md +++ b/content/desktop/containerd.md @@ -11,7 +11,7 @@ image and file system management in the Docker Engine. > **Beta** > > The containerd image store feature is currently in -> [Beta](../../release-lifecycle.md/#beta). We recommend that you do not use +> [Beta](../release-lifecycle.md/#beta). We recommend that you do not use > this feature in production environments as this feature may change or be > removed from future releases. { .experimental } @@ -34,7 +34,7 @@ Docker Engine, including: or [nydus][2] and [dragonfly][3] for peer-to-peer image distribution. - Natively store and build multi-platform images, and other OCI content types that may emerge in the future. -- Ability to run [Wasm](../wasm/_index.md) containers +- Ability to run [Wasm](wasm.md) containers [1]: https://github.com/containerd/stargz-snapshotter [2]: https://github.com/containerd/nydus-snapshotter @@ -147,7 +147,7 @@ d28bdb47b683: Pushed Inspecting the tag on Docker Hub shows that the image is available for multiple platforms. -![Multiplatform image tag on Docker Hub](../images/containerd_multiplatform.png) +![Multiplatform image tag on Docker Hub](images/containerd_multiplatform.png) ## Known issues @@ -191,4 +191,4 @@ Inspecting the tag on Docker Hub shows that the image is available for multiple Thanks for trying the new features available with `containerd`. Give feedback or report any bugs you may find through the issues tracker on the -[feedback form](https://dockr.ly/3PODIhD). \ No newline at end of file +[feedback form](https://dockr.ly/3PODIhD). diff --git a/content/desktop/release-notes.md b/content/desktop/release-notes.md index a949eb5cfb5..84b4895d508 100644 --- a/content/desktop/release-notes.md +++ b/content/desktop/release-notes.md @@ -176,7 +176,7 @@ For frequently asked questions about Docker Desktop releases, see [FAQs](faqs/re - [Compose v2.22.0](https://github.com/docker/compose/releases/tag/v2.22.0) - [Go 1.21.1](https://github.com/golang/go/releases/tag/go1.21.1) -- [Wasm](../desktop/wasm/_index.md) runtimes: +- [Wasm](../desktop/wasm.md) runtimes: - wasmtime, wasmedge `v0.2.0`. - lunatic, slight, spin, and wws`v0.9.1`. - Added wasmer wasm shims. @@ -237,7 +237,7 @@ For frequently asked questions about Docker Desktop releases, see [FAQs](faqs/re - [Compose v2.21.0](https://github.com/docker/compose/releases/tag/v2.21.0) - [Docker Engine v24.0.6](https://docs.docker.com/engine/release-notes/24.0/#2406) - [Docker Scout CLI v0.24.1](https://github.com/docker/scout-cli/releases/tag/v0.24.1). -- [Wasm](../desktop/wasm/_index.md) runtimes: +- [Wasm](../desktop/wasm.md) runtimes: - wasmtime, wasmedge revision `d0a1a1cd`. - slight and spin wasm `v0.9.0`. diff --git a/content/desktop/wasm/_index.md b/content/desktop/wasm.md similarity index 96% rename from content/desktop/wasm/_index.md rename to content/desktop/wasm.md index 8e302a34f65..a8016701d7b 100644 --- a/content/desktop/wasm/_index.md +++ b/content/desktop/wasm.md @@ -7,7 +7,7 @@ toc_max: 3 > **Beta** > -> The Wasm feature is currently in [Beta](../../release-lifecycle.md/#beta). +> The Wasm feature is currently in [Beta](../release-lifecycle.md/#beta). > We recommend that you do not use this feature in production environments as > this feature may change or be removed from future releases. { .experimental } @@ -21,7 +21,7 @@ alongside your Linux containers in Docker. ## Turn on Wasm workloads -Wasm workloads require the [containerd image store](../containerd/index.md) +Wasm workloads require the [containerd image store](containerd.md) feature to be turned on. If you’re not already using the containerd image store, then pre-existing images and containers will be inaccessible. @@ -191,7 +191,7 @@ containerd image store, an error similar to the following displays: docker: Error response from daemon: Unknown runtime specified io.containerd.wasmedge.v1. ``` -[Turn on the containerd feature](../containerd/index.md#turn-on-the-containerd-image-store-feature) +[Turn on the containerd feature](containerd.md#turn-on-the-containerd-image-store-feature) in Docker Desktop settings and try again. ### Failed to start shim: failed to resolve runtime path diff --git a/content/scout/image-analysis.md b/content/scout/image-analysis.md index ceff6d21aac..c86e6e9236a 100644 --- a/content/scout/image-analysis.md +++ b/content/scout/image-analysis.md @@ -72,7 +72,7 @@ analysis is activated. Scout uses attestations to provide more fine-grained analysis results. The default `docker` driver only supports build attestations if you use the - [containerd image store](../desktop/containerd/_index.md). + [containerd image store](../desktop/containerd.md). 3. Go to the [Docker Scout Dashboard](https://scout.docker.com/) 4. Sign in with your Docker ID. diff --git a/content/scout/sbom.md b/content/scout/sbom.md index fe227dfaad7..dbd8aa25e3b 100644 --- a/content/scout/sbom.md +++ b/content/scout/sbom.md @@ -78,7 +78,7 @@ $ docker build --tag / \ The default, non-containerd image store doesn't currently support images with attestations. To build images with SBOM attestations, you can either turn on -the [containerd image store](../desktop/containerd/_index.md) feature, or use a +the [containerd image store](../desktop/containerd.md) feature, or use a `docker-container` builder together with the `--push` flag to push the image (with attestations) directly to a registry.