Skip to content
Closed
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
2 changes: 2 additions & 0 deletions content/manuals/ai/sandboxes/security/credentials.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ checks and the API domains it authenticates requests to:
| ----------- | ---------------------------------- | ----------------------------------- |
| `anthropic` | `ANTHROPIC_API_KEY` | `api.anthropic.com` |
| `aws` | `AWS_ACCESS_KEY_ID` | AWS Bedrock endpoints |
| `cursor` | `CURSOR_API_KEY` | `api2.cursor.sh` |
| `droid` | `FACTORY_API_KEY` | Factory API endpoints |
| `github` | `GH_TOKEN`, `GITHUB_TOKEN` | `api.github.com`, `github.com` |
| `google` | `GEMINI_API_KEY`, `GOOGLE_API_KEY` | `generativelanguage.googleapis.com` |
| `groq` | `GROQ_API_KEY` | `api.groq.com` |
Expand Down
13 changes: 13 additions & 0 deletions content/manuals/build/builders/drivers/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,16 @@ If you need additional configuration and flexibility, consider using the

For more information on the Docker driver, see the
[buildx reference](/reference/cli/docker/buildx/create/#driver).

## Limitations

The Docker driver has the following limitations:


- You can't configure custom BuildKit versions or parameters. These are
managed internally by the Docker Engine.
- Multi-platform builds require the containerd image store. If your Docker
Engine uses legacy graph-drivers, multi-platform builds are not supported.
Docker Engine v29.x and later uses containerd snapshotters by default,
which does support multi-platform builds. See
[containerd image store](../../../storage/containerd.md) for more details.
Comment on lines +44 to +53
13 changes: 9 additions & 4 deletions content/manuals/build/building/multi-platform.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,15 @@ QEMU that's bundled within the Docker Desktop VM.

#### Install QEMU manually

If you're using a builder outside of Docker Desktop, such as if you're using
Docker Engine on Linux, or a custom remote builder, you need to install QEMU
and register the executable types on the host OS. The prerequisites for
installing QEMU are:
If the QEMU emulators bundled with BuildKit aren't available for your build,
manual installation may be required. This is typically only necessary when:

- You're using a third-party BuildKit package that doesn't bundle QEMU emulators
- You're using an older Docker Engine version without bundled QEMU support
- You're running a custom BuildKit installation where emulators aren't included

In these situations, install QEMU and register the executable types on the host
OS. The prerequisites for installing QEMU are:

- Linux kernel version 4.8 or later
- `binfmt-support` version 2.1.7 or later
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ services:

> [!IMPORTANT]
>
> Be aware of [Environment variables precedence](envvars-precedence.md) when using variables in an `.env` file that as environment variables in your container's environment.
> Be aware of [Environment variables precedence](envvars-precedence.md) when using variables in an `.env` file that are also set as environment variables in your container's environment.

- You can place your `.env` file in a location other than the root of your project's directory, and then use the [`--env-file` option in the CLI](#substitute-with---env-file) so Compose can navigate to it.

Expand Down
2 changes: 1 addition & 1 deletion content/manuals/dhi/core-concepts/vex.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ OpenVEX status values.
| `not_affected` | The CVE was reported against a package in the image, but Docker has assessed it is not exploitable as shipped |
| `under_investigation` | Docker is aware of the CVE and is actively evaluating whether it affects the image |
| `affected` | Docker has confirmed the CVE is exploitable in the image and a fix is not yet available |

| `fixed` | A fix for the CVE is available in this version. DHI does not use this status; see [Why DHI does not use `fixed`](#why-dhi-does-not-use-fixed) |
You can view the VEX statements for any DHI using Docker Scout. See [Scan Docker
Hardened Images](/manuals/dhi/how-to/scan.md).

Expand Down
29 changes: 28 additions & 1 deletion content/manuals/engine/daemon/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,12 @@ This page shows you how to customize the Docker daemon, `dockerd`.
## Configure the Docker daemon

There are two ways to configure the Docker daemon:
There are three ways to configure the Docker daemon:

- Use a JSON configuration file. This is the preferred option, since it keeps
all configurations in a single place.
- Use flags when starting `dockerd`.
- Use environment variables to set daemon options.

You can use both of these options together as long as you don't specify the same
option both as a flag and in the JSON file. If that happens, the Docker daemon
Expand Down Expand Up @@ -92,6 +93,32 @@ running:
$ dockerd --help
```

### Configuration using environment variables

You can configure the Docker daemon using environment variables. This is useful
in systemd service overrides or init scripts.

To set environment variables for the Docker daemon using systemd, create a
drop-in override file:

````````console
$ sudo systemctl edit docker
```````

Add the following:

``````ini
[Service]
Environment="DOCKER_OPTS=--debug --tls=true"
`````

Then reload and restart the daemon:

````console
$ sudo systemctl daemon-reload
$ sudo systemctl restart docker
```
Comment on lines +104 to +120

## Daemon data directory

The Docker daemon persists all data in a single directory. This tracks
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -275,14 +275,13 @@ Replace the `ui/src/App.tsx` file with the following code:
```tsx

// ui/src/App.tsx
import React, { useEffect } from 'react';
import React, { useEffect, useState } from 'react';
import { createDockerDesktopClient } from "@docker/extension-api-client";

//obtain docker desktop extension client
const ddClient = createDockerDesktopClient();

export function App() {
const ddClient = createDockerDesktopClient();
const [hello, setHello] = useState<string>();

useEffect(() => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@






---
Comment on lines +1 to 7
title: Invoke host binaries
description: Add invocations to host binaries from the frontend with the extension
Expand Down Expand Up @@ -70,8 +76,12 @@ In this example, the binary returns a string as result, obtained by `result?.std
{{< tab name="React" >}}

```typescript
import React, { useState, useEffect } from 'react';
import { createDockerDesktopClient } from '@docker/extension-api-client';

const ddClient = createDockerDesktopClient();

export function App() {
const ddClient = createDockerDesktopClient();
const [hello, setHello] = useState("");

useEffect(() => {
Expand Down
11 changes: 6 additions & 5 deletions content/manuals/scout/integrations/environment/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ that version of the image to the `staging` environment.

To add environments to Docker Scout, you can:

- Use the `docker scout env <environment> <image>` CLI command to record images to environments manually
- Use the `docker scout environment <environment> <image>` CLI command to record images to environments manually
- Enable a runtime integration to automatically detect images in your environments.

Docker Scout supports the following runtime integrations:
Expand All @@ -52,15 +52,15 @@ To see all of the available environments for an organization, you can use the
`docker scout env` command.

```console
$ docker scout env
$ docker scout environment
```

By default, this prints all environments for your personal Docker organization.
To list environments for another organization that you're a part of, use the
`--org` flag.

```console
$ docker scout env --org <org>
$ docker scout environment --org <org>
```

You can use the `docker scout config` command to change the default
Expand Down Expand Up @@ -98,10 +98,11 @@ The list displays all images that have been assigned to the selected
environment. If you've deployed multiple versions of the same image in an
environment, all versions of the image appear in the list.

Alternatively, you can use the `docker scout env` command to view the images from the terminal.
Alternatively, you can Use the `docker scout environment` command to view the images from the terminal.
use the `docker scout environment` command to view the images from the terminal.
Comment on lines +101 to +102

```console
$ docker scout env production
$ docker scout environment production
docker/scout-demo-service:main@sha256:ef08dca54c4f371e7ea090914f503982e890ec81d22fd29aa3b012351a44e1bc
```

Expand Down