From 7008f1f2130f21d9261ccb57c18d191c42dfd373 Mon Sep 17 00:00:00 2001 From: Craig Osterhout <103533812+craig-osterhout@users.noreply.github.com> Date: Fri, 31 Jan 2025 14:10:10 -0800 Subject: [PATCH 1/5] add aliases for 404s (#21945) ## Description Add some aliases for some top 404s. https://heapanalytics.com/app/env/4204607514/graph/chart/Docs-Weekly-404-Errors-13539083 ## Related issues or tickets ## Reviews - [ ] Editorial review Signed-off-by: Craig --- .../desktop/settings-and-maintenance/backup-and-restore.md | 2 +- content/manuals/desktop/setup/install/_index.md | 1 + .../manuals/desktop/troubleshoot-and-support/faqs/general.md | 1 + .../manuals/desktop/troubleshoot-and-support/faqs/linuxfaqs.md | 1 + .../manuals/desktop/troubleshoot-and-support/faqs/macfaqs.md | 1 + content/manuals/engine/network/_index.md | 1 + content/manuals/engine/storage/drivers/_index.md | 1 + content/reference/compose-file/_index.md | 1 + 8 files changed, 8 insertions(+), 1 deletion(-) diff --git a/content/manuals/desktop/settings-and-maintenance/backup-and-restore.md b/content/manuals/desktop/settings-and-maintenance/backup-and-restore.md index b985426334c2..bec9b9f232b4 100644 --- a/content/manuals/desktop/settings-and-maintenance/backup-and-restore.md +++ b/content/manuals/desktop/settings-and-maintenance/backup-and-restore.md @@ -4,7 +4,7 @@ keywords: Docker Desktop, backup, restore, migration, reinstall, containers, ima volumes weight: 20 aliases: - - /desktop/backup-and-restore.md + - /desktop/backup-and-restore/ --- Use the following procedure to save and restore your images and container data. This is useful if you want to reset your VM disk or to move your Docker environment to a new diff --git a/content/manuals/desktop/setup/install/_index.md b/content/manuals/desktop/setup/install/_index.md index 3b6650ef5cdf..44d7b98a8cc7 100644 --- a/content/manuals/desktop/setup/install/_index.md +++ b/content/manuals/desktop/setup/install/_index.md @@ -5,4 +5,5 @@ title: Install weight: 10 aliases: - /desktop/install/ +- /desktop/setup/install/ --- diff --git a/content/manuals/desktop/troubleshoot-and-support/faqs/general.md b/content/manuals/desktop/troubleshoot-and-support/faqs/general.md index 2a48392d84ed..e7ac429bf936 100644 --- a/content/manuals/desktop/troubleshoot-and-support/faqs/general.md +++ b/content/manuals/desktop/troubleshoot-and-support/faqs/general.md @@ -9,6 +9,7 @@ aliases: - /docker-for-mac/faqs/ - /docker-for-windows/faqs/ - /desktop/faqs/ +- /desktop/faqs/general/ weight: 10 --- diff --git a/content/manuals/desktop/troubleshoot-and-support/faqs/linuxfaqs.md b/content/manuals/desktop/troubleshoot-and-support/faqs/linuxfaqs.md index 0cd0dbc98566..3f8729ba6e92 100644 --- a/content/manuals/desktop/troubleshoot-and-support/faqs/linuxfaqs.md +++ b/content/manuals/desktop/troubleshoot-and-support/faqs/linuxfaqs.md @@ -6,6 +6,7 @@ linkTitle: Linux tags: [FAQ] aliases: - /desktop/linux/space/ +- /desktop/faqs/linuxfaqs/ weight: 40 --- diff --git a/content/manuals/desktop/troubleshoot-and-support/faqs/macfaqs.md b/content/manuals/desktop/troubleshoot-and-support/faqs/macfaqs.md index 84b109f4a247..e1129dbd0cd5 100644 --- a/content/manuals/desktop/troubleshoot-and-support/faqs/macfaqs.md +++ b/content/manuals/desktop/troubleshoot-and-support/faqs/macfaqs.md @@ -7,6 +7,7 @@ tags: [FAQ] aliases: - /desktop/mac/space/ - /docker-for-mac/space/ +- /desktop/faqs/macfaqs/ weight: 20 --- diff --git a/content/manuals/engine/network/_index.md b/content/manuals/engine/network/_index.md index 0ffc841b59f7..a16b5b8b02ea 100644 --- a/content/manuals/engine/network/_index.md +++ b/content/manuals/engine/network/_index.md @@ -7,6 +7,7 @@ keywords: networking, container, standalone, IP address, DNS resolution aliases: - /articles/networking/ - /config/containers/container-networking/ +- /engine/tutorials/networkingcontainers/ - /engine/userguide/networking/ - /engine/userguide/networking/configure-dns/ - /engine/userguide/networking/default_network/binding/ diff --git a/content/manuals/engine/storage/drivers/_index.md b/content/manuals/engine/storage/drivers/_index.md index 57bf355e7b81..c6241730936c 100644 --- a/content/manuals/engine/storage/drivers/_index.md +++ b/content/manuals/engine/storage/drivers/_index.md @@ -6,6 +6,7 @@ weight: 40 aliases: - /storage/storagedriver/imagesandcontainers/ - /storage/storagedriver/ + - /engine/userguide/storagedriver/imagesandcontainers/ --- To use storage drivers effectively, it's important to know how Docker builds and diff --git a/content/reference/compose-file/_index.md b/content/reference/compose-file/_index.md index f29f59f40235..2c24cfb4130a 100644 --- a/content/reference/compose-file/_index.md +++ b/content/reference/compose-file/_index.md @@ -36,6 +36,7 @@ aliases: - /compose/yaml/ - /compose/compose-file/compose-file-v1/ - /compose/compose-file/ + - /compose/reference/overview/ --- >**New to Docker Compose?** From 668d86b8bf0c93b45a980d4c4a7e251134dd0127 Mon Sep 17 00:00:00 2001 From: Natividad Baena <109590606+nbaenam@users.noreply.github.com> Date: Sat, 1 Feb 2025 14:04:13 +0100 Subject: [PATCH 2/5] Fixed set up 'setup' is a noun and 'set up' is a verb --- content/manuals/admin/organization/onboard.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/content/manuals/admin/organization/onboard.md b/content/manuals/admin/organization/onboard.md index 5128be290981..a5b9aff24ac0 100644 --- a/content/manuals/admin/organization/onboard.md +++ b/content/manuals/admin/organization/onboard.md @@ -86,8 +86,7 @@ By default, members of your organization can use Docker Desktop without signing in. When users don’t sign in as a member of your organization, they don’t receive the [benefits of your organization’s subscription](../../subscription/details.md) and they can circumvent [Docker’s security features](/security/for-admins/hardened-desktop/). -There are multiple ways you can enforce sign-in, depending on your company's -set up and preferences: +There are multiple ways you can enforce sign-in, depending on your company's setup and preferences: - [Registry key method (Windows only)](/security/for-admins/enforce-sign-in/methods/#registry-key-method-windows-only) - [`.plist` method (Mac only)](/security/for-admins/enforce-sign-in/methods/#plist-method-mac-only) - [`registry.json` method (All)](/security/for-admins/enforce-sign-in/methods/#registryjson-method-all) From ca9eb9721a8997835708fb0ebd33f36f961cef00 Mon Sep 17 00:00:00 2001 From: Mikko Pesari Date: Mon, 3 Feb 2025 10:46:43 +0200 Subject: [PATCH 3/5] Fix build example diff in multi-platform.md --- content/manuals/build/building/multi-platform.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/manuals/build/building/multi-platform.md b/content/manuals/build/building/multi-platform.md index 175cddb470f0..e60db90b3808 100644 --- a/content/manuals/build/building/multi-platform.md +++ b/content/manuals/build/building/multi-platform.md @@ -468,7 +468,7 @@ Steps: WORKDIR /app ADD https://github.com/dvdksn/buildme.git#eb6279e0ad8a10003718656c6867539bd9426ad8 . -RUN go build -o server . - RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o server . + +RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o server . FROM alpine COPY --from=build /app/server /server From 01a0f9718d4f6cc788fd988f9651959ad9c145df Mon Sep 17 00:00:00 2001 From: Plain <56195905+hanjie-chen@users.noreply.github.com> Date: Mon, 3 Feb 2025 16:46:59 +0800 Subject: [PATCH 4/5] Update file-watch.md: add ignore attribute path (#21820) ## Description I added some explanation about the `ignore` attribute in the watch rule. I noticed the document says: > All paths are relative to the project directory However, when I deployed it in my project, I found that my container was rebuilding crazily based on the action I defined. After testing, I discovered that the `ignore` path is actually relative to the `path` defined in the same `watch` rule, not the project directory. I also confirmed this with the AI on the Docker Docs website. This PR updates the documentation to clarify this behavior. --------- Co-authored-by: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Co-authored-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- content/manuals/compose/how-tos/file-watch.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/content/manuals/compose/how-tos/file-watch.md b/content/manuals/compose/how-tos/file-watch.md index 9b22aa5ece9b..2af413a3b5cb 100644 --- a/content/manuals/compose/how-tos/file-watch.md +++ b/content/manuals/compose/how-tos/file-watch.md @@ -12,7 +12,7 @@ aliases: {{% include "compose/watch.md" %}} `watch` adheres to the following file path rules: -* All paths are relative to the project directory +* All paths are relative to the project directory, apart from ignore file patterns * Directories are watched recursively * Glob patterns aren't supported * Rules from `.dockerignore` apply @@ -114,6 +114,10 @@ For `path: ./app/html` and a change to `./app/html/index.html`: * `target: /app/static` -> `/app/static/index.html` * `target: /assets` -> `/assets/index.html` +### `ignore` + +The `ignore` patterns are relative to the `path` defined in the current `watch` action, not to the project directory. In the following Example 1, the ignore path would be relative to the `./web` directory specified in the `path` attribute. + ## Example 1 This minimal example targets a Node.js application with the following structure: @@ -121,7 +125,8 @@ This minimal example targets a Node.js application with the following structure: myproject/ ├── web/ │ ├── App.jsx -│ └── index.js +│ ├── index.js +│ └── node_modules/ ├── Dockerfile ├── compose.yaml └── package.json @@ -152,6 +157,8 @@ For example, `./web/App.jsx` is copied to `/src/web/App.jsx`. Once copied, the bundler updates the running application without a restart. +And in this case, the `ignore` rule would apply to `myproject/web/node_modules/`, not `myproject/node_modules/`. + Unlike source code files, adding a new dependency can’t be done on-the-fly, so whenever `package.json` is changed, Compose rebuilds the image and recreates the `web` service container. From 0020f7d97b939ce88d26d2c1fe0e0b27116bb59d Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Mon, 3 Feb 2025 10:35:25 +0100 Subject: [PATCH 5/5] bake: remove experimental callout (#21954) ## Description Bake is GA since Buildx 0.20.0, seems https://github.com/docker/docs/pull/21667 didn't take this commit into account: https://github.com/docker/docs/pull/21858/commits/705190702afe041272281bd56275fa3a387d98c9 ## Reviews - [ ] Technical review - [ ] Editorial review - [ ] Product review Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- content/manuals/build/bake/_index.md | 2 -- data/summary.yaml | 2 -- 2 files changed, 4 deletions(-) diff --git a/content/manuals/build/bake/_index.md b/content/manuals/build/bake/_index.md index 5c9b5c15ab8c..ee9e59453cdd 100644 --- a/content/manuals/build/bake/_index.md +++ b/content/manuals/build/bake/_index.md @@ -6,8 +6,6 @@ aliases: - /build/customize/bake/ --- -{{< summary-bar feature_name="Build bake" >}} - Bake is a feature of Docker Buildx that lets you define your build configuration using a declarative file, as opposed to specifying a complex CLI expression. It also lets you run multiple builds concurrently with a single invocation. diff --git a/data/summary.yaml b/data/summary.yaml index a339aa254014..b7cfa2076309 100644 --- a/data/summary.yaml +++ b/data/summary.yaml @@ -25,8 +25,6 @@ Azure blob: availability: Experimental Build additional contexts: requires: Docker Compose [2.17.0](/manuals/compose/releases/release-notes.md#2170) and later -Build bake: - availability: Experimental Build checks: availability: Beta requires: Docker Buildx [0.15.0](/manuals/compose/releases/release-notes.md#0150) and later