Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions content/manuals/admin/organization/onboard.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions content/manuals/build/bake/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion content/manuals/build/building/multi-platform.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 9 additions & 2 deletions content/manuals/compose/how-tos/file-watch.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -114,14 +114,19 @@ 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:
```text
myproject/
├── web/
│ ├── App.jsx
│ └── index.js
│ ├── index.js
│ └── node_modules/
├── Dockerfile
├── compose.yaml
└── package.json
Expand Down Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions content/manuals/desktop/setup/install/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ title: Install
weight: 10
aliases:
- /desktop/install/
- /desktop/setup/install/
---
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ aliases:
- /docker-for-mac/faqs/
- /docker-for-windows/faqs/
- /desktop/faqs/
- /desktop/faqs/general/
weight: 10
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ linkTitle: Linux
tags: [FAQ]
aliases:
- /desktop/linux/space/
- /desktop/faqs/linuxfaqs/
weight: 40
---

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ tags: [FAQ]
aliases:
- /desktop/mac/space/
- /docker-for-mac/space/
- /desktop/faqs/macfaqs/
weight: 20
---

Expand Down
1 change: 1 addition & 0 deletions content/manuals/engine/network/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
1 change: 1 addition & 0 deletions content/manuals/engine/storage/drivers/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions content/reference/compose-file/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ aliases:
- /compose/yaml/
- /compose/compose-file/compose-file-v1/
- /compose/compose-file/
- /compose/reference/overview/
---

>**New to Docker Compose?**
Expand Down
2 changes: 0 additions & 2 deletions data/summary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down