diff --git a/.github/vale/Docker/ComplexWords.yml b/.github/vale/Docker/ComplexWords.yml
index 7c4fb90cd3..03af01a343 100644
--- a/.github/vale/Docker/ComplexWords.yml
+++ b/.github/vale/Docker/ComplexWords.yml
@@ -63,6 +63,7 @@ swap:
facilitate: ease
females: women
finalize: complete|finish
+ illustrate: show
itemized: listed
jeopardize: risk
liaise: work with|partner with
diff --git a/.github/vale/Docker/Substitute.yml b/.github/vale/Docker/Substitute.yml
index d44f28011b..9acd2d28a4 100644
--- a/.github/vale/Docker/Substitute.yml
+++ b/.github/vale/Docker/Substitute.yml
@@ -3,6 +3,8 @@ message: "Consider using '%s' instead of '%s'"
link: https://docs.docker.com/contribute/style/recommended-words/
ignorecase: true
level: suggestion
+action:
+ name: replace
swap:
'\b(?:eg|e\.g\.)[\s,]': for example
'\b(?:ie|i\.e\.)[\s,]': that is
diff --git a/.github/vale/Vocab/Docker/accept.txt b/.github/vale/Vocab/Docker/accept.txt
index 55de96b6d7..15788d2708 100644
--- a/.github/vale/Vocab/Docker/accept.txt
+++ b/.github/vale/Vocab/Docker/accept.txt
@@ -1,4 +1,5 @@
(Certified|Verified) Publisher( Program)?
+Docker-Sponsored Open Source
Autotest
BuildKit
Docker
diff --git a/README.md b/README.md
index 0a860be5a3..9645991f8f 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ an existing issue. If possible, we recommend that you suggest a fix to the issue
by creating a pull request.
You can ask general questions and get community support through the [Docker
-Community Slack](http://dockr.ly/slack). Personalized support is available
+Community Slack](https://dockr.ly/comm-slack). Personalized support is available
through the Docker Pro, Team, and Business subscriptions. See [Docker
Pricing](https://www.docker.com/pricing) for details.
@@ -49,4 +49,4 @@ contribute, see our [Contribute section](https://docs.docker.com/contribute/over
## Copyright and license
-Copyright 2013-2023 Docker, inc, released under the Apache 2.0 license.
+Copyright 2013-2023 Docker, inc, released under the Apache 2.0 license .
diff --git a/_config.yml b/_config.yml
index d8fa1a732e..cbbd0472bc 100644
--- a/_config.yml
+++ b/_config.yml
@@ -45,7 +45,7 @@ exclude:
latest_engine_api_version: "1.42"
docker_ce_version: "23.0.0"
compose_v1_version: "1.29.2"
-compose_version: "v2.16.0"
+compose_version: "v2.17.2"
compose_file_v3: "3.9"
compose_file_v2: "2.4"
machine_version: "0.16.0"
@@ -215,3 +215,50 @@ fetch-remote:
- dest: "build/attestations/attestation-storage.md"
src:
- "docs/attestations/attestation-storage.md"
+
+ - repo: "https://github.com/compose-spec/compose-spec"
+ default_branch: "master"
+ ref: "master"
+ paths:
+ - dest: "compose/compose-file/01-status.md"
+ src:
+ - "01-status.md"
+ - dest: "compose/compose-file/02-model.md"
+ src:
+ - "02-model.md"
+ - dest: "compose/compose-file/03-compose-file.md"
+ src:
+ - "03-compose-file.md"
+ - dest: "compose/compose-file/04-version-and-name.md"
+ src:
+ - "04-version-and-name.md"
+ - dest: "compose/compose-file/05-services.md"
+ src:
+ - "05-services.md"
+ - dest: "compose/compose-file/06-networks.md"
+ src:
+ - "06-networks.md"
+ - dest: "compose/compose-file/07-volumes.md"
+ src:
+ - "07-volumes.md"
+ - dest: "compose/compose-file/08-configs.md"
+ src:
+ - "08-configs.md"
+ - dest: "compose/compose-file/09-secrets.md"
+ src:
+ - "09-secrets.md"
+ - dest: "compose/compose-file/10-fragments.md"
+ src:
+ - "10-fragments.md"
+ - dest: "compose/compose-file/11-extension.md"
+ src:
+ - "11-extension.md"
+ - dest: "compose/compose-file/12-interpolation.md"
+ src:
+ - "12-interpolation.md"
+ - dest: "compose/compose-file/build.md"
+ src:
+ - "build.md"
+ - dest: "compose/compose-file/deploy.md"
+ src:
+ - "deploy.md"
diff --git a/_data/compose-cli/docker_compose.yaml b/_data/compose-cli/docker_compose.yaml
index c3ee6f33c3..16b3d3fd9d 100644
--- a/_data/compose-cli/docker_compose.yaml
+++ b/_data/compose-cli/docker_compose.yaml
@@ -63,12 +63,19 @@ long: |-
### Use `-p` to specify a project name
- Each configuration has a project name. If you supply a `-p` flag, you can specify a project name. If you don’t
- specify the flag, Compose uses the current directory name.
- Project name can also be set by `COMPOSE_PROJECT_NAME` environment variable.
-
- Many Compose subcommands can be run without a Compose file by passing
- the project name.
+ Each configuration has a project name. Compose sets the project name using
+ the following mechanisms, in order of precedence:
+ - The `-p` command line flag
+ - The `COMPOSE_PROJECT_NAME` environment variable
+ - The top level `name:` variable from the config file (or the last `name:`
+ from a series of config files specified using `-f`)
+ - The `basename` of the project directory containing the config file (or
+ containing the first config file specified using `-f`)
+ - The `basename` of the current directory if no config file is specified
+ Project names must contain only lowercase letters, decimal digits, dashes,
+ and underscores, and must begin with a lowercase letter or decimal digit. If
+ the `basename` of the project directory or current directory violates this
+ constraint, you must use one of the other mechanisms.
```console
$ docker compose -p my_project ps -a
@@ -198,7 +205,8 @@ options:
kubernetes: false
swarm: false
- option: env-file
- value_type: string
+ value_type: stringArray
+ default_value: '[]'
description: Specify an alternate environment file.
deprecated: false
hidden: false
diff --git a/_data/compose-cli/docker_compose_convert.yaml b/_data/compose-cli/docker_compose_convert.yaml
new file mode 100644
index 0000000000..d191322196
--- /dev/null
+++ b/_data/compose-cli/docker_compose_convert.yaml
@@ -0,0 +1,140 @@
+command: docker compose convert
+aliases: docker compose convert, docker compose config
+short: Converts the compose file to platform's canonical format
+long: |-
+ `docker compose convert` renders the actual data model to be applied on the target platform. When used with the Docker engine,
+ it merges the Compose files set by `-f` flags, resolves variables in the Compose file, and expands short-notation into
+ the canonical format.
+
+ To allow smooth migration from docker-compose, this subcommand declares alias `docker compose config`
+usage: docker compose convert [OPTIONS] [SERVICE...]
+pname: docker compose
+plink: docker_compose.yaml
+options:
+ - option: format
+ value_type: string
+ default_value: yaml
+ description: 'Format the output. Values: [yaml | json]'
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: hash
+ value_type: string
+ description: Print the service config hash, one per line.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: images
+ value_type: bool
+ default_value: "false"
+ description: Print the image names, one per line.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: no-consistency
+ value_type: bool
+ default_value: "false"
+ description: |
+ Don't check model consistency - warning: may produce invalid Compose output
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: no-interpolate
+ value_type: bool
+ default_value: "false"
+ description: Don't interpolate environment variables.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: no-normalize
+ value_type: bool
+ default_value: "false"
+ description: Don't normalize compose model.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: output
+ shorthand: o
+ value_type: string
+ description: Save to file (default to stdout)
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: profiles
+ value_type: bool
+ default_value: "false"
+ description: Print the profile names, one per line.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: quiet
+ shorthand: q
+ value_type: bool
+ default_value: "false"
+ description: Only validate the configuration, don't print anything.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: resolve-image-digests
+ value_type: bool
+ default_value: "false"
+ description: Pin image tags to digests.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: services
+ value_type: bool
+ default_value: "false"
+ description: Print the service names, one per line.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: volumes
+ value_type: bool
+ default_value: "false"
+ description: Print the volume names, one per line.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+deprecated: false
+experimental: false
+experimentalcli: false
+kubernetes: false
+swarm: false
+
diff --git a/_data/compose-cli/docker_compose_restart.yaml b/_data/compose-cli/docker_compose_restart.yaml
index ea6c2628b8..91ba742e84 100644
--- a/_data/compose-cli/docker_compose_restart.yaml
+++ b/_data/compose-cli/docker_compose_restart.yaml
@@ -15,6 +15,16 @@ usage: docker compose restart [OPTIONS] [SERVICE...]
pname: docker compose
plink: docker_compose.yaml
options:
+ - option: no-deps
+ value_type: bool
+ default_value: "false"
+ description: Don't restart dependent services.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
- option: timeout
shorthand: t
value_type: int
diff --git a/_data/compose-cli/docker_compose_up.yaml b/_data/compose-cli/docker_compose_up.yaml
index f8ab468e7b..fb3dcb98cc 100644
--- a/_data/compose-cli/docker_compose_up.yaml
+++ b/_data/compose-cli/docker_compose_up.yaml
@@ -231,18 +231,6 @@ options:
experimentalcli: false
kubernetes: false
swarm: false
- - option: timeout
- shorthand: t
- value_type: int
- default_value: "10"
- description: |
- Use this timeout in seconds for container shutdown when attached or when containers are already running.
- deprecated: false
- hidden: false
- experimental: false
- experimentalcli: false
- kubernetes: false
- swarm: false
- option: timestamps
value_type: bool
default_value: "false"
@@ -263,6 +251,28 @@ options:
experimentalcli: false
kubernetes: false
swarm: false
+ - option: wait-timeout
+ value_type: int
+ default_value: "0"
+ description: timeout waiting for application to be running|healthy.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: waitTimeout
+ shorthand: t
+ value_type: int
+ default_value: "10"
+ description: |
+ Use this waitTimeout in seconds for container shutdown when attached or when containers are already running.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
deprecated: false
experimental: false
experimentalcli: false
diff --git a/_data/init-cli/docker_init.yaml b/_data/init-cli/docker_init.yaml
new file mode 100644
index 0000000000..cecb378cb5
--- /dev/null
+++ b/_data/init-cli/docker_init.yaml
@@ -0,0 +1,150 @@
+command: docker init
+short: Creates Docker-related starter files for your project
+long: |-
+ Initialize a project with the files necessary to run the project in a container.
+
+ Docker Desktop 4.18 and later provides the Docker Init plugin with the `docker init` CLI command. Run `docker init` in your project directory to be walked through the creation of the following files with sensible defaults for your project:
+
+ * .dockerignore
+ * Dockerfile
+ * docker-compose.yaml
+
+ If any of the files already exist, a prompt appears and provides a warning as well as giving you the option to overwrite all the files.
+
+ > **Warning**
+ >
+ > You can't recover overwritten files.
+ > To back up an existing file before selecting to overwrite it, rename the file or copy it to another directory.
+ {: .warning}
+
+ After running `docker init`, you can choose one of the following templates:
+
+ * Go: Suitable for a Go server application.
+ * Other: General purpose starting point for containerizing your application.
+
+ After `docker init` has completed, you must modify the created files and tailor them to your project. Visit the following topics to learn more about the files:
+
+ * [.dockerignore](../../../engine/reference/builder.md#dockerignore-file)
+ * [Dockerfile](../../../engine/reference/builder.md)
+ * [docker-compose.yaml](../../../compose/compose-file/03-compose-file.md)
+
+usage: docker init [OPTIONS]
+pname: docker
+plink: docker.yaml
+options:
+ - option: version
+ value_type: bool
+ default_value: "false"
+ description: Display version of the init plugin
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+deprecated: false
+experimental: false
+experimentalcli: false
+kubernetes: false
+swarm: false
+examples: |-
+ ### Example of selecting Other
+
+ The following example runs `docker init` and walks through the options after selecting `Other`.
+
+ ```console
+ $ docker init
+
+ Welcome to the Docker Init CLI!
+
+ This utility will walk you through creating the following files with sensible defaults for your project:
+ - .dockerignore
+ - Dockerfile
+ - docker-compose.yaml
+
+ Let's get started!
+
+ ? What application platform does your project use? [Use arrows to move, type to filter]
+ > Go - suitable for a Go server application
+ Other - general purpose starting point for containerizing your application
+ Don't see something you need? Let us know!
+ Quit
+ ```
+
+ The following appears after selecting `Other`.
+
+ ```console
+ CREATED: .dockerignore
+ CREATED: Dockerfile
+ CREATED: docker-compose.yaml
+
+ ✔ Your Docker files are ready!
+
+ Take a moment to review them and tailor them to your application.
+
+ When you're ready, start your application by running: docker compose up --build
+ ```
+
+ ### Example of selecting Go
+
+ The following example runs `docker init` and walks through the options after selecting `Go`.
+
+ ```console
+ $ docker init
+
+ Welcome to the Docker Init CLI!
+
+ This utility will walk you through creating the following files with sensible defaults for your project:
+ - .dockerignore
+ - Dockerfile
+ - docker-compose.yaml
+
+ Let's get started!
+
+ ? What application platform does your project use? [Use arrows to move, type to filter]
+ > Go - (detected) suitable for a Go server application
+ Other - general purpose starting point for containerizing your application
+ Don't see something you need? Let us know!
+ Quit
+ ```
+
+ The following appears after selecting `Go`.
+
+ ```console
+ ? What application platform does your project use? Go
+ ? What version of Go do you want to use? (1.20)
+ ```
+
+ The following appears after selecting the default `1.20`.
+
+ ```console
+ ? What version of Go do you want to use? 1.20
+ ? What's the relative directory (with a leading .) of your main package? (.)
+ ```
+
+ The following appears after selecting the default `.`.
+
+ ```console
+ ? What's the relative directory (with a leading .) of your main package? .
+ ? What port does your server listen on? (3333)
+ ```
+
+ The following appears after selecting the default `3333`.
+
+ ```console
+ ? What port does your server listen on? 3333
+
+ CREATED: .dockerignore
+ CREATED: Dockerfile
+ CREATED: docker-compose.yaml
+
+ ✔ Your Docker files are ready!
+
+ Take a moment to review them and tailor them to your application.
+
+ When you're ready, start your application by running: docker compose up --build -d
+
+ Your application will be available at http://localhost:3333
+
+ To stop your application, run: docker compose down
+ ```
diff --git a/_data/scout-cli/docker_scout.yaml b/_data/scout-cli/docker_scout.yaml
index bf884ac855..9e06255a14 100644
--- a/_data/scout-cli/docker_scout.yaml
+++ b/_data/scout-cli/docker_scout.yaml
@@ -5,10 +5,16 @@ usage: docker scout [command]
pname: docker
plink: docker.yaml
cname:
+ - docker scout compare
- docker scout cves
+ - docker scout quickview
+ - docker scout recommendations
- docker scout version
clink:
+ - docker_scout_compare.yaml
- docker_scout_cves.yaml
+ - docker_scout_quickview.yaml
+ - docker_scout_recommendations.yaml
- docker_scout_version.yaml
deprecated: false
experimental: false
diff --git a/_data/scout-cli/docker_scout_compare.yaml b/_data/scout-cli/docker_scout_compare.yaml
new file mode 100644
index 0000000000..cf01b4d5bf
--- /dev/null
+++ b/_data/scout-cli/docker_scout_compare.yaml
@@ -0,0 +1,212 @@
+command: docker scout compare
+short: '[early preview] Compare two images and display differences'
+long: |-
+ The `docker scout compare` command analyzes two images and displays a comparison of both.
+
+ > This command is in **early preview** and its behaviour might change in the future
+
+ The main usage is to compare two versions of the same image.
+ For instance when a new image is built and compared to the version running in production.
+
+ The following artifact types are supported:
+
+ - Images
+ - OCI layout directories
+ - Tarball archives, as created by `docker save`
+
+ The tool analyzes the provided software artifact, and generates a vulnerability report.
+
+ By default, the tool expects an image reference, such as:
+
+ - `redis`
+ - `curlimages/curl:7.87.0`
+ - `mcr.microsoft.com/dotnet/runtime:7.0`
+
+ If the artifact you want to analyze is an OCI directory or a tarball archive, you must use the `--type` or `--to-type` flag.
+usage: docker scout compare --to IMAGE|DIRECTORY|ARCHIVE IMAGE|DIRECTORY|ARCHIVE
+pname: docker scout
+plink: docker_scout.yaml
+options:
+ - option: debug
+ value_type: bool
+ default_value: "false"
+ description: Debug messages
+ deprecated: false
+ hidden: true
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: format
+ value_type: string
+ default_value: text
+ description: |-
+ Output format of the generated vulnerability report:
+ - text: default output, plain text with or without colors depending on the terminal
+ - markdown: Markdown output
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: ignore-base
+ value_type: bool
+ default_value: "false"
+ description: Filter out CVEs introduced from base image
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: only-fixed
+ value_type: bool
+ default_value: "false"
+ description: Filter to fixable CVEs
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: only-package-type
+ value_type: stringSlice
+ default_value: '[]'
+ description: |
+ Comma separated list of package types (like apk, deb, rpm, npm, pypi, golang, etc)
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: only-severity
+ value_type: stringSlice
+ default_value: '[]'
+ description: |
+ Comma separated list of severities (critical, high, medium, low, unspecified) to filter CVEs by
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: only-unfixed
+ value_type: bool
+ default_value: "false"
+ description: Filter to unfixed CVEs
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: output
+ shorthand: o
+ value_type: string
+ description: Write the report to a file.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: platform
+ value_type: string
+ description: Platform of image to analyze
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: ref
+ value_type: string
+ description: |-
+ Reference to use if the provided tarball contains multiple references.
+ Can only be used with --type archive.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: to
+ value_type: string
+ description: image, directory or archive to compare to
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: to-ref
+ value_type: string
+ description: |-
+ Reference to use if the provided tarball contains multiple references.
+ Can only be used with --type archive.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: to-type
+ value_type: string
+ default_value: image
+ description: |-
+ Type of the image to analyze. Can be one of:
+ - image
+ - oci-dir
+ - archive (docker save tarball)
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: type
+ value_type: string
+ default_value: image
+ description: |-
+ Type of the image to analyze. Can be one of:
+ - image
+ - oci-dir
+ - archive (docker save tarball)
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+examples: |-
+ ### Compare an image to the latest tag
+
+ ```console
+ $ docker scout compare --to namespace/repo:latest namespace/repo:v1.2.3-pre
+ ```
+
+ ### Ignore base images
+
+ ```console
+ $ docker scout compare --ignore-base --to namespace/repo:latest namespace/repo:v1.2.3-pre
+ ```
+
+ ### Generate a markdown output
+
+ ```console
+ $ docker scout compare --format markdown --to namespace/repo:latest namespace/repo:v1.2.3-pre
+ ```
+
+ ### Only compare maven packages and only display critical vulnerabilities for maven packages
+
+ ```console
+ $ docker scout compare --only-package-type maven --only-severity critical --to namespace/repo:latest namespace/repo:v1.2.3-pre
+ ```
+deprecated: false
+experimental: false
+experimentalcli: false
+kubernetes: false
+swarm: false
+
diff --git a/_data/scout-cli/docker_scout_cves.yaml b/_data/scout-cli/docker_scout_cves.yaml
index c852b528a6..bb5bf4f596 100644
--- a/_data/scout-cli/docker_scout_cves.yaml
+++ b/_data/scout-cli/docker_scout_cves.yaml
@@ -54,7 +54,7 @@ options:
swarm: false
- option: format
value_type: string
- default_value: txt-by-packages
+ default_value: packages
description: |-
Output format of the generated vulnerability report:
- packages: default output, plain text with vulnerabilities grouped by packages
@@ -111,7 +111,7 @@ options:
value_type: stringSlice
default_value: '[]'
description: |
- Comma separated list of severities (critical, high, medium, low) to filter CVEs by
+ Comma separated list of severities (critical, high, medium, low, unspecified) to filter CVEs by
deprecated: false
hidden: false
experimental: false
@@ -140,7 +140,7 @@ options:
swarm: false
- option: platform
value_type: string
- description: Platform of image for which to list CVEs for
+ description: Platform of image to analyze
deprecated: false
hidden: false
experimental: false
diff --git a/_data/scout-cli/docker_scout_quickview.yaml b/_data/scout-cli/docker_scout_quickview.yaml
new file mode 100644
index 0000000000..9c8c2346bb
--- /dev/null
+++ b/_data/scout-cli/docker_scout_quickview.yaml
@@ -0,0 +1,91 @@
+command: docker scout quickview
+short: Quick overview of an image
+long: |-
+ The `docker scout quickview` command displays a quick overview of an image.
+ It displays a summary of the vulnerabilities in the image and the vulnerabilities from the base image.
+ If available it also displays base image refresh and update recommendations.
+usage: docker scout quickview IMAGE|DIRECTORY|ARCHIVE
+pname: docker scout
+plink: docker_scout.yaml
+options:
+ - option: debug
+ value_type: bool
+ default_value: "false"
+ description: Debug messages
+ deprecated: false
+ hidden: true
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: output
+ shorthand: o
+ value_type: string
+ description: Write the report to a file.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: platform
+ value_type: string
+ description: Platform of image to analyze
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: ref
+ value_type: string
+ description: |-
+ Reference to use if the provided tarball contains multiple references.
+ Can only be used with --type archive.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: type
+ value_type: string
+ default_value: image
+ description: |-
+ Type of the image to analyze. Can be one of:
+ - image
+ - oci-dir
+ - archive (docker save tarball)
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+examples: |-
+ ### Quick overview of an image
+
+ ```console
+ $ docker scout quickview golang:1.19.4
+ ...Pulling
+ ✓ Pulled
+ ✓ SBOM of image already cached, 278 packages indexed
+
+ Your image golang:1.19.4 │ 5C 3H 6M 63L
+ Base image buildpack-deps:bullseye-scm │ 5C 1H 3M 48L 6?
+ Refreshed base image buildpack-deps:bullseye-scm │ 0C 0H 0M 42L
+ │ -5 -1 -3 -6 -6
+ Updated base image buildpack-deps:sid-scm │ 0C 0H 1M 29L
+ │ -5 -1 -2 -19 -6
+
+ │ Know more about vulnerabilities:
+ │ docker scout cves golang:1.19.4
+ │ Know more about base image update recommendations:
+ │ docker scout recommendations golang:1.19.4
+ ```
+deprecated: false
+experimental: false
+experimentalcli: false
+kubernetes: false
+swarm: false
+
diff --git a/_data/scout-cli/docker_scout_recommendations.yaml b/_data/scout-cli/docker_scout_recommendations.yaml
new file mode 100644
index 0000000000..5200ca30ea
--- /dev/null
+++ b/_data/scout-cli/docker_scout_recommendations.yaml
@@ -0,0 +1,133 @@
+command: docker scout recommendations
+short: Display available base image updates and remediation recommendations
+long: |-
+ The `docker scout recommendations` command display recommendations for base images updates.
+ It analyzes the image and display recommendations to refresh or update the base image.
+ For each recommendation it shows a list of benefits like less vulnerabilities, smaller image, etc.
+
+ The following artifact types are supported:
+
+ - Images
+ - OCI layout directories
+ - Tarball archives, as created by `docker save`
+
+ The tool analyzes the provided software artifact, and generates base image updates and remediation recommendations.
+
+ By default, the tool expects an image reference, such as:
+
+ - `redis`
+ - `curlimages/curl:7.87.0`
+ - `mcr.microsoft.com/dotnet/runtime:7.0`
+
+ If the artifact you want to analyze is an OCI directory or a tarball archive, you must use the `--type` flag.
+usage: docker scout recommendations IMAGE|DIRECTORY|ARCHIVE
+pname: docker scout
+plink: docker_scout.yaml
+options:
+ - option: debug
+ value_type: bool
+ default_value: "false"
+ description: Debug messages
+ deprecated: false
+ hidden: true
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: only-refresh
+ value_type: bool
+ default_value: "false"
+ description: Only display base image refresh recommendations
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: only-update
+ value_type: bool
+ default_value: "false"
+ description: Only display base image update recommendations
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: output
+ shorthand: o
+ value_type: string
+ description: Write the report to a file.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: platform
+ value_type: string
+ description: Platform of image to analyze
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: ref
+ value_type: string
+ description: |-
+ Reference to use if the provided tarball contains multiple references.
+ Can only be used with --type archive.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: tag
+ value_type: string
+ description: Specify tag
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: type
+ value_type: string
+ default_value: image
+ description: |-
+ Type of the image to analyze. Can be one of:
+ - image
+ - oci-dir
+ - archive (docker save tarball)
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+examples: |-
+ ### Display base image update recommendations
+
+ ```console
+ $ docker scout recommendations golang:1.19.4
+ ```
+
+ ### Display base image refresh only recommendations
+
+ ```console
+ $ docker scout recommendations --only-refresh golang:1.19.4
+ ```
+
+ ### Display base image update only recommendations
+
+ ```console
+ $ docker scout recommendations --only-update golang:1.19.4
+ ```
+deprecated: false
+experimental: false
+experimentalcli: false
+kubernetes: false
+swarm: false
+
diff --git a/_data/scout-cli/docker_scout_sbom.yaml b/_data/scout-cli/docker_scout_sbom.yaml
new file mode 100644
index 0000000000..7a1d3e99e1
--- /dev/null
+++ b/_data/scout-cli/docker_scout_sbom.yaml
@@ -0,0 +1,135 @@
+command: docker scout sbom
+short: Generate or display SBOM of an image
+long: |-
+ The `docker scout sbom` command analyzes a software artifact to generate the corresponding Software Bill Of Materials (SBOM).
+
+ The SBOM can be used to list all packages, or the ones from a specific type (as dep, maven, etc).
+
+ The following artifact types are supported:
+
+ - Images
+ - OCI layout directories
+ - Tarball archives, as created by `docker save`
+
+ The tool analyzes the provided software artifact, and generates a vulnerability report.
+
+ By default, the tool expects an image reference, such as:
+
+ - `redis`
+ - `curlimages/curl:7.87.0`
+ - `mcr.microsoft.com/dotnet/runtime:7.0`
+
+ If the artifact you want to analyze is an OCI directory or a tarball archive, you must use the `--type` flag.
+usage: docker scout sbom IMAGE|DIRECTORY|ARCHIVE
+pname: docker scout
+plink: docker_scout.yaml
+options:
+ - option: debug
+ value_type: bool
+ default_value: "false"
+ description: Debug messages
+ deprecated: false
+ hidden: true
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: format
+ value_type: string
+ default_value: json
+ description: |-
+ Output format:
+ - list: list of packages of the image
+ - json: json representation of the SBOM
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: only-package-type
+ value_type: stringSlice
+ default_value: '[]'
+ description: |-
+ Comma separated list of package types (like apk, deb, rpm, npm, pypi, golang, etc)
+ Can only be used with --format list
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: output
+ shorthand: o
+ value_type: string
+ description: Write the report to a file.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: platform
+ value_type: string
+ description: Platform of image to analyze
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: ref
+ value_type: string
+ description: |-
+ Reference to use if the provided tarball contains multiple references.
+ Can only be used with --type archive.
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+ - option: type
+ value_type: string
+ default_value: image
+ description: |-
+ Type of the image to analyze. Can be one of:
+ - image
+ - oci-dir
+ - archive (docker save tarball)
+ deprecated: false
+ hidden: false
+ experimental: false
+ experimentalcli: false
+ kubernetes: false
+ swarm: false
+examples: |-
+ ### Display the list of packages
+
+ ```console
+ $ docker scout sbom alpine
+ ```
+
+ ### Only display packages of a specific type
+
+ ```console
+ $ docker scout sbom --only-package-type apk alpine
+ ```
+
+ ### Display the full SBOM as json
+
+ ```console
+ $ docker scout sbom --format json alpine
+ ```
+
+ ### Write SBOM to a file
+
+ ```console
+ $ docker scout sbom --format json --output alpine.sbom alpine
+ ```
+deprecated: false
+experimental: false
+experimentalcli: false
+kubernetes: false
+swarm: false
+
diff --git a/_data/toc.yaml b/_data/toc.yaml
index c15ef3d043..a845b0aa19 100644
--- a/_data/toc.yaml
+++ b/_data/toc.yaml
@@ -49,6 +49,18 @@ guides:
path: /get-started/09_image_best/
- title: "Part 10: What next?"
path: /get-started/11_what_next/
+- sectiontitle: Docker Desktop hands-on guides
+ section:
+ - path: /get-started/hands-on-overview/
+ title: Overview
+ - path: /get-started/what-is-a-container/
+ title: What is a container?
+ - path: /get-started/run-your-own-container/
+ title: How do I run a container?
+ - path: /get-started/run-docker-hub-images/
+ title: Run Docker Hub images
+ - path: /get-started/publish-your-own-image/
+ title: Publish your images
- sectiontitle: Language-specific guides
section:
- path: /language/
@@ -499,6 +511,8 @@ reference:
title: docker import
- path: /engine/reference/commandline/info/
title: docker info
+ - path: /engine/reference/commandline/init/
+ title: docker init (Beta)
- path: /engine/reference/commandline/inspect/
title: docker inspect
- path: /engine/reference/commandline/kill/
@@ -609,8 +623,14 @@ reference:
section:
- path: /engine/reference/commandline/scout/
title: docker scout
+ - path: /engine/reference/commandline/scout_compare/
+ title: docker scout compare
- path: /engine/reference/commandline/scout_cves/
title: docker scout cves
+ - path: /engine/reference/commandline/scout_quickview/
+ title: docker scout quickview
+ - path: /engine/reference/commandline/scout_recommendations/
+ title: docker scout recommendations
- path: /engine/reference/commandline/scout_version/
title: docker scout version
- path: /engine/reference/commandline/search/
@@ -884,8 +904,34 @@ reference:
path: /engine/reference/builder/
- sectiontitle: Compose file reference
section:
- - path: /compose/compose-file/
- title: Compose Specification
+ - sectiontitle: Compose specification
+ section:
+ - path: /compose/compose-file/
+ title: Overview
+ - path: /compose/compose-file/01-status/
+ title: Status of the specification
+ - path: /compose/compose-file/02-model/
+ title: Compose application model
+ - path: /compose/compose-file/03-compose-file/
+ title: The Compose file
+ - path: /compose/compose-file/04-version-and-name/
+ title: Version and name top-level element
+ - path: /compose/compose-file/05-services/
+ title: Services top-level element
+ - path: /compose/compose-file/06-networks/
+ title: Network top-level element
+ - path: /compose/compose-file/07-volumes/
+ title: Volumes top-level element
+ - path: /compose/compose-file/08-configs/
+ title: Configs top-level element
+ - path: /compose/compose-file/09-secrets/
+ title: Secrets top-level element
+ - path: /compose/compose-file/10-fragments/
+ title: Fragments
+ - path: /compose/compose-file/11-extension/
+ title: Extensions
+ - path: /compose/compose-file/12-interpolation/
+ title: Interpolation
- path: /compose/compose-file/build/
title: Compose file build
- path: /compose/compose-file/deploy/
@@ -1581,6 +1627,16 @@ manuals:
title: Kubernetes driver
- path: /build/drivers/remote/
title: Remote driver
+ - sectiontitle: Exporters
+ section:
+ - path: /build/exporters/
+ title: Overview
+ - path: /build/exporters/image-registry/
+ title: Image and registry exporters
+ - path: /build/exporters/local-tar/
+ title: Local and tar exporters
+ - path: /build/exporters/oci-docker/
+ title: OCI and Docker exporters
- sectiontitle: Cache
section:
- path: /build/cache/
@@ -1603,50 +1659,6 @@ manuals:
title: Azure Blob Storage
- path: /build/cache/backends/s3/
title: Amazon S3
- - sectiontitle: Exporters
- section:
- - path: /build/exporters/
- title: Overview
- - path: /build/exporters/image-registry/
- title: Image and registry exporters
- - path: /build/exporters/local-tar/
- title: Local and tar exporters
- - path: /build/exporters/oci-docker/
- title: OCI and Docker exporters
- - sectiontitle: Continuous integration
- section:
- - path: /build/ci/
- title: CI with Docker
- - sectiontitle: GitHub Actions
- section:
- - path: /build/ci/github-actions/
- title: Introduction
- - path: /build/ci/github-actions/configure-builder/
- title: Configuring your builder
- - path: /build/ci/github-actions/multi-platform/
- title: Multi-platform image
- - path: /build/ci/github-actions/secrets/
- title: Secrets
- - path: /build/ci/github-actions/push-multi-registries/
- title: Push to multi-registries
- - path: /build/ci/github-actions/manage-tags-labels/
- title: Manage tags and labels
- - path: /build/ci/github-actions/cache/
- title: Cache management
- - path: /build/ci/github-actions/export-docker/
- title: Export to Docker
- - path: /build/ci/github-actions/test-before-push/
- title: Test before push
- - path: /build/ci/github-actions/local-registry/
- title: Local registry
- - path: /build/ci/github-actions/share-image-jobs/
- title: Share built image between jobs
- - path: /build/ci/github-actions/named-contexts/
- title: Named contexts
- - path: /build/ci/github-actions/copy-image-registries/
- title: Copy image between registries
- - path: /build/ci/github-actions/update-dockerhub-desc/
- title: Update Docker Hub repo description
- sectiontitle: Bake
section:
- path: /build/bake/
@@ -1683,6 +1695,40 @@ manuals:
title: Configure
- path: /build/buildkit/toml-configuration/
title: TOML configuration
+ - sectiontitle: Continuous integration
+ section:
+ - path: /build/ci/
+ title: CI with Docker
+ - sectiontitle: GitHub Actions
+ section:
+ - path: /build/ci/github-actions/
+ title: Introduction
+ - path: /build/ci/github-actions/configure-builder/
+ title: Configuring your builder
+ - path: /build/ci/github-actions/multi-platform/
+ title: Multi-platform image
+ - path: /build/ci/github-actions/secrets/
+ title: Secrets
+ - path: /build/ci/github-actions/push-multi-registries/
+ title: Push to multi-registries
+ - path: /build/ci/github-actions/manage-tags-labels/
+ title: Manage tags and labels
+ - path: /build/ci/github-actions/cache/
+ title: Cache management
+ - path: /build/ci/github-actions/export-docker/
+ title: Export to Docker
+ - path: /build/ci/github-actions/test-before-push/
+ title: Test before push
+ - path: /build/ci/github-actions/local-registry/
+ title: Local registry
+ - path: /build/ci/github-actions/share-image-jobs/
+ title: Share built image between jobs
+ - path: /build/ci/github-actions/named-contexts/
+ title: Named contexts
+ - path: /build/ci/github-actions/copy-image-registries/
+ title: Copy image between registries
+ - path: /build/ci/github-actions/update-dockerhub-desc/
+ title: Update Docker Hub repo description
- path: /build/release-notes/
title: Release notes
- sectiontitle: Docker Compose
@@ -1741,68 +1787,54 @@ manuals:
section:
- path: /docker-hub/
title: Overview
+ - path: /docker-id/
+ title: Create an account
- path: /docker-hub/quickstart/
title: Quickstart
- - path: /docker-id/
- title: Docker ID accounts
- sectiontitle: Repositories
section:
- - path: /docker-hub/repos/
- title: Manage
+ - path: /docker-hub/repos/create/
+ title: Create
- path: /docker-hub/repos/access/
title: Access
- - path: /docker-hub/repos/configure/
- title: Configure
- - path: /docker-hub/service-accounts/
- title: Service accounts
+ - path: /docker-hub/repos/
+ title: Manage
- path: /docker-hub/official_images/
title: Docker Official images
- - sectiontitle: Automated builds
- section:
- - path: /docker-hub/builds/
- title: Set up automated builds
- - path: /docker-hub/builds/automated-testing/
- title: Testing in automated builds
- - path: /docker-hub/builds/advanced/
- title: Advanced automated builds
- - path: /docker-hub/builds/link-source/
- title: Link to GitHub and BitBucket
- - path: /docker-hub/webhooks/
- title: Webhooks
- - path: /docker-hub/vulnerability-scanning/
- title: Vulnerability scanning
- - path: /docker-hub/audit-log/
- title: Audit logs
- - sectiontitle: Security and authentication
- section:
- - path: /docker-hub/access-tokens/
- title: Manage access tokens
- - sectiontitle: Two-factor authentication
- section:
- - path: /docker-hub/2fa/
- title: Enable two-factor authentication
- - path: /docker-hub/2fa/disable-2fa/
- title: Disable two-factor authentication
- - path: /docker-hub/2fa/recover-hub-account/
- title: Recover your Docker Hub account
- - path: /docker-hub/2fa/new-recovery-code/
- title: Generate a new recovery code
- path: /docker-hub/download-rate-limit/
title: Download rate limit
- - sectiontitle: Administration
+ - path: /docker-hub/webhooks/
+ title: Webhooks
+ - path: /docker-hub/service-accounts/
+ title: Service accounts
+ - sectiontitle: Automated builds
section:
- - path: /docker-hub/image-management/
- title: Advanced Image Management dashboard
- - path: /docker-hub/convert-account/
- title: Convert an account into an organization
- - path: /docker-hub/deactivate-account/
- title: Deactivate an account or an organization
+ - path: /docker-hub/builds/how-builds-work/
+ title: How Automated builds work
+ - path: /docker-hub/builds/
+ title: Set up Automated builds
+ - path: /docker-hub/builds/manage-builds/
+ title: Manage your builds
+ - path: /docker-hub/builds/troubleshoot/
+ title: Troubleshoot your builds
+ - path: /docker-hub/builds/automated-testing/
+ title: Testing in Automated builds
+ - path: /docker-hub/builds/advanced/
+ title: Advanced options for builds
+ - path: /docker-hub/builds/link-source/
+ title: Link to GitHub and BitBucket
+ - path: /docker-hub/vulnerability-scanning/
+ title: Vulnerability scanning
+ - path: /docker-hub/image-management/
+ title: Advanced Image Management
- sectiontitle: Docker Verified Publisher
section:
- path: /docker-hub/publish/
title: Overview
- path: /docker-hub/publish/insights-analytics/
title: Insights and analytics
+ - path: /docker-hub/dsos-program/
+ title: Docker-Sponsored Open Source Program
- path: /docker-hub/oci-artifacts/
title: OCI artifacts
- path: /docker-hub/release-notes/
@@ -1819,8 +1851,10 @@ manuals:
- path: /scout/artifactory/
title: Artifactory integration
-- sectiontitle: Administration
+- sectiontitle: Administration and security
section:
+ - path: /docker-hub/admin-overview/
+ title: Overview
- sectiontitle: Onboarding
section:
- path: /docker-hub/onboard-team/
@@ -1839,8 +1873,10 @@ manuals:
title: FAQs
- path: /docker-hub/orgs/
title: Create your organization
+ - path: /docker-hub/convert-account/
+ title: Convert an account into an organization
- path: /docker-hub/manage-a-team/
- title: Manage a team
+ title: Create and manage a team
- path: /docker-hub/members/
title: Manage members
- path: /docker-hub/configure-sign-in/
@@ -1859,10 +1895,30 @@ manuals:
title: FAQs
- path: /docker-hub/scim/
title: SCIM
+ - path: /docker-hub/group-mapping/
+ title: Group mapping
+ - sectiontitle: Security and authentication
+ section:
+ - path: /docker-hub/access-tokens/
+ title: Create and manage access tokens
+ - sectiontitle: Two-factor authentication
+ section:
+ - path: /docker-hub/2fa/
+ title: Enable two-factor authentication
+ - path: /docker-hub/2fa/disable-2fa/
+ title: Disable two-factor authentication
+ - path: /docker-hub/2fa/recover-hub-account/
+ title: Recover your Docker Hub account
+ - path: /docker-hub/2fa/new-recovery-code/
+ title: Generate a new recovery code
+ - path: /docker-hub/audit-log/
+ title: Audit logs
- path: /docker-hub/domain-audit/
title: Domain audit
- path: /docker-hub/image-access-management/
title: Image Access Management
+ - path: /docker-hub/deactivate-account/
+ title: Deactivate an account or organization
- sectiontitle: Billing
section:
diff --git a/_includes/desktop-install.html b/_includes/desktop-install.html
index 9924565939..7a8cf2e560 100644
--- a/_includes/desktop-install.html
+++ b/_includes/desktop-install.html
@@ -13,7 +13,7 @@
Download file
- Checksum: SHA-256 69ea659b0ca0e160a1de9bd63dc5697f5eb89fff1d33484fb8ef9793e43d0d45
+ Checksum: SHA-256 7b17e26d7c2d0245ba9f2526e20349e113819cfb47d1f3e8dbd3cc8ea8ccf6b7
@@ -31,7 +31,7 @@
Download file
- Checksum: SHA-256 eb0531122a62859ce7b029e943fdad365603a916e6c15c107514c1e4a818d7ef
+ Checksum: SHA-256 2e099af08e17666228282b970992160fa423ce8f5fa9e36b79495a1960803091
@@ -49,7 +49,7 @@
Download file
- Checksum: SHA-256 5e01465d93dfe18d7678a96705e7c26bb654b6766f06373b5cffbf77c641bccc
+ Checksum: SHA-256 2ae4b2ec556c107f969e51b72ad1920fefa38dbd0d8e3db64815c26b9f2b126d
@@ -64,10 +64,10 @@
What are the system requirements for Docker Desktop?
-Where can I find example Compose files?
- -How do I share images on Docker Hub?
+What are the system requirements for Docker Desktop?
+Where can I find example Compose files?
+ +Learn how to develop language-specific apps using Docker.
-Containerize a Node.js app using Docker
-Containerize a Python app using Docker
-Containerize a Java app using Docker
-Containerize a Go app using Docker
-View more languages and frameworks in Docker samples
+Containerize a Node.js app using Docker
+Containerize a Python app using Docker
+Containerize a Java app using Docker
+ +Self-paced tutorials to increase your Docker knowledge.
diff --git a/assets/images/arrow-up.svg b/assets/images/arrow-up.svg new file mode 100644 index 0000000000..080c6e5367 --- /dev/null +++ b/assets/images/arrow-up.svg @@ -0,0 +1,38 @@ + + diff --git a/assets/images/desktop.svg b/assets/images/desktop.svg new file mode 100644 index 0000000000..9b860ba6f1 --- /dev/null +++ b/assets/images/desktop.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/sign-on.svg b/assets/images/sign-on.svg new file mode 100644 index 0000000000..ae97ce20a9 --- /dev/null +++ b/assets/images/sign-on.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/sso.svg b/assets/images/sso.svg new file mode 100644 index 0000000000..74c98cd475 --- /dev/null +++ b/assets/images/sso.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/js/anchorlinks.js b/assets/js/anchorlinks.js index 088a0a1e49..750f964703 100644 --- a/assets/js/anchorlinks.js +++ b/assets/js/anchorlinks.js @@ -1,7 +1,7 @@ (function (d) { "use strict"; for (const h of d.querySelectorAll("H1, H2, H3")) { - if (h.id != null && h.id.length > 0) { + if (h.id != null && h.id.length > 0 && !h.parentElement.classList.contains("component")) { h.insertAdjacentHTML('beforeend', `🔗`) } } diff --git a/billing/faqs.md b/billing/faqs.md index 4b86156ffd..78210decea 100644 --- a/billing/faqs.md +++ b/billing/faqs.md @@ -48,3 +48,15 @@ Contact the [Docker Sales Team](https://www.docker.com/company/contact){:target= ### Do I need to do anything at the end of my subscription term? No. All monthly and annual subscriptions are automatically renewed at the end of the term using the original form of payment. + +### How do I redeem a coupon? + +You can redeem a coupon for any paid Docker subscription. + +A coupon can be used when you: +- Sign up to a new paid subscription from a free subscription +- Upgrade an existing paid subscription + +You are asked to enter your coupon code when you confirm or enter your payment method. + +If you use a coupon to pay for a subscription, when the coupon expires, your payment method is charged the full cost of your subscription. If you do not have a saved payment method, your account is downgraded to a free subscription. diff --git a/build/attestations/sbom.md b/build/attestations/sbom.md index 187eab0469..f28d3fa8fc 100644 --- a/build/attestations/sbom.md +++ b/build/attestations/sbom.md @@ -214,7 +214,7 @@ an open source tool for generating an SBOM. You can select a different plugin to use with the `generator` option, specifying an image that implements the -[BuildKit SBOM scanner protocol](https://github.com/moby/buildkit/blob/master/docs/sbom-protocol.md){: target="blank" rel="noopener" }. +[BuildKit SBOM scanner protocol](https://github.com/moby/buildkit/blob/master/docs/attestations/sbom-protocol.md){: target="blank" rel="noopener" }. ```console $ docker buildx build --attest type=sbom,generator=- Avoid unnecessary repetitions of costly operations, such as package installs. -
-- Learn how to use Docker in your continuous integration pipelines. -
-+ Avoid unnecessary repetitions of costly operations, such as package installs. +
++ Learn how to use Docker in your continuous integration pipelines. +
+Learn how to onboard with Docker Team or Docker Business subscription.
+Add an extra layer of authentication to your Docker account.
+Sign up and create a new Docker ID
Create personal access tokens as an alternative to your password.
+Create and manage automated builds and autotesting.