Skip to content

Commit b5fd76d

Browse files
Clarify BuildKit daemon lifecycle and terminal requirements on Windows
1 parent f02e2a5 commit b5fd76d

45 files changed

Lines changed: 797 additions & 386 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

_vendor/github.com/docker/compose/v5/docs/reference/compose_run.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_vendor/github.com/docker/compose/v5/docs/reference/docker_compose_run.yaml

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

content/manuals/accounts/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Docker accounts
33
description: Learn how to create and manage your Docker account
44
keywords: accounts, docker ID, account management, account settings, docker account, docker home
5-
weight: 30
5+
weight: 10
66
params:
77
sidebar:
88
group: Platform

content/manuals/accounts/deactivate-user-account.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Before deactivating your Docker account, ensure you meet the following requireme
3232
organization, or deactivate the organization. Similarly, if you are the sole
3333
owner of a company, either add someone else as a company owner and then remove
3434
yourself, or deactivate the company.
35-
- If you have an active Docker subscription, [downgrade it to a Docker Personal subscription](../subscription/change.md).
35+
- If you have an active Docker subscription, [downgrade it to a Docker Personal subscription](../subscription/plans/docker.md#cancel-a-docker-plan).
3636
- Download any images and tags you want to keep. Use `docker pull -a <image>`
3737
to pull all tags, or `docker pull <image>:<tag>` to pull a specific tag.
3838
- If you linked a GitHub or Bitbucket account for automated builds, unlink it.

content/manuals/admin/organization/deactivate-account.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ organization:
2626

2727
- Download any images and tags you want to keep. Use `docker pull -a <image>`
2828
to pull all tags, or `docker pull <image>:<tag>` to pull a specific tag.
29-
- If you have an active Docker subscription, [downgrade it to a free subscription](../../subscription/change.md).
29+
- If you have an active Docker subscription, [downgrade it to a free subscription](../../subscription/plans/docker.md#cancel-a-docker-plan).
3030
- Remove all other members within the organization.
3131
- Unlink your [GitHub and Bitbucket accounts](../../docker-hub/repos/manage/builds/link-source.md#unlink-a-github-user-account).
3232
- For Business organizations, [remove your SSO connection](/manuals/enterprise/security/single-sign-on/manage.md#delete-a-connection).

content/manuals/admin/organization/manage/manage-licenses.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,43 +6,43 @@ keywords: licenses, organization, members, Docker Core, Docker Offload, AI gover
66
weight: 30
77
---
88

9-
Licenses let you selectively choose which of your organization members have access to supported Docker products. Organization owners can oversee who on their team has active licenses, or configure licenses to assign automatically when members access supported Docker products. Like Docker Core seats, licenses can be configured on a per member basis.
9+
Licenses let you selectively choose which of your organization members have access to supported Docker products. Organization owners can oversee who on their team has active licenses, or configure licenses to assign automatically when members access supported Docker products. Like Docker Core seats, licenses can be configured on a per member basis.
1010

1111
> [!TIP]
12-
> To learn more about product licenses, Docker Core seats, and other Docker add-ons see [scale your subscription](/manuals/subscription/scale.md),
12+
> To learn more about product licenses, Docker Core seats, and other Docker add-ons see [Docker plans](/manuals/subscription/plans/_index.md),
1313
> or <a href="https://www.docker.com/pricing/contact-sales/" id="dkr_docs_cs_admin_licenses" class="link" rel="noopener">contact sales</a> to purchase licenses.
1414
1515
## Manage licenses
1616

17-
The **Members** page lets you track the number of available licenses for your organization and who currently holds a license. You can also assign or revoke licenses from this page.
17+
The **Members** page lets you track the number of available licenses for your organization and who currently holds a license. You can also assign or revoke licenses from this page.
1818

19-
To manage licenses for your organization:
19+
To manage licenses for your organization:
2020

2121
1. Sign in to [Docker Home](https://app.docker.com), then choose your organization.
2222
1. Select **Members** from the left navigation.
2323
1. Select the action menu at the end of the row to assign or revoke an active license.
24-
1. Optional. To bulk assign or revoke licenses, choose the members you want to bulk manage, then select the **Bulk actions** menu.
25-
1. Optional. To manage automatic license assignment, turn off or turn on with the **Automatically assign licenses** toggle.
24+
1. Optional. To bulk assign or revoke licenses, choose the members you want to bulk manage, then select the **Bulk actions** menu.
25+
1. Optional. To manage automatic license assignment, turn off or turn on with the **Automatically assign licenses** toggle.
2626

2727
You must assign licenses manually, or configure automatic license assignment to consume a license. Inviting a new member to your organization consumes a seat or license if you select a product in **Licenses (optional)** during the [invite flow](/manuals/admin/organization/manage/members.md), but won't auto-assign product licenses by default. Conversely, purchasing a set of licenses won't trigger automatic assignment to existing members.
2828

2929
## Automatic license assignment
3030

31-
Automatic license assignment gives members a product license when they use a supported product for the first time. Automatic license assignment is available for AI Governance licenses. Only organizations that purchase AI Governance can set up auto-assignment for Docker Core as well.
31+
Automatic license assignment gives members a product license when they use a supported product for the first time. Automatic license assignment is available for AI Governance licenses. Only organizations that purchase AI Governance can set up auto-assignment for Docker Core as well.
3232

33-
- When you purchase AI Governance, signing into [Docker Sandboxes](https://docs.docker.com/ai/sandboxes/) with `login` command in `sbx` CLI (`sbx login`) automatically provisions AI Governance licenses on a first-come, first served basis.
33+
- When you purchase AI Governance, signing into [Docker Sandboxes](https://docs.docker.com/ai/sandboxes/) with `login` command in `sbx` CLI (`sbx login`) automatically provisions AI Governance licenses on a first-come, first served basis.
3434
- Similarly, logins to Docker Desktop will automatically provision Docker Core for AI Governance license-holding organizations that have available Docker Core seats.
35-
- Licenses are assigned until exhausted.
36-
- Once the available licenses are exhausted, automatic license assignment will stop until you purchase more licenses or revoke assigned licenses.
37-
- Members can still use Docker Sandbox or Docker Desktop, but organization policies for those products won't affect their usage.
35+
- Licenses are assigned until exhausted.
36+
- Once the available licenses are exhausted, automatic license assignment will stop until you purchase more licenses or revoke assigned licenses.
37+
- Members can still use Docker Sandbox or Docker Desktop, but organization policies for those products won't affect their usage.
3838

3939
AI Governance licenses include single sign-on (SSO) and provisioning features regardless of your Docker Core subscription. Automatic license assignment requires [setting up SSO](/manuals/enterprise/security/single-sign-on/connect.md), then [provisioning](/manuals/enterprise/security/provisioning/_index.md) with System for Cross-domain Identity Management (SCIM) or Just-in-Time (JIT).
4040

4141
## What's next
4242

4343
See these docs to explore Docker Core add-ons, or products that need licenses:
4444

45-
- [Scale your subscription](/manuals/subscription/scale.md) to learn about different add-ons
45+
- [Docker plans](/manuals/subscription/plans/_index.md) to learn about different add-ons
4646
- [Manage seats](/manuals/admin/organization/manage/manage-seats.md) to add more seats to your Docker Core subscription
4747
- [AI Governance](/manuals/ai/sandboxes/governance/org.md) to set up organization policies for your organization members
4848
- [Docker Offload](/manuals/offload/about.md) to let your developers offload building and running containers to the cloud

content/manuals/admin/organization/manage/manage-products.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,4 +149,4 @@ To view usage for Docker products:
149149
[Docker Offload usage and billing](/manuals/offload/usage.md).
150150

151151
If your usage or seat count exceeds your subscription amount, you can
152-
[scale your subscription](../../../subscription/scale.md) to meet your needs.
152+
[add seats](./manage-seats.md) or [view available Docker plans](../../../subscription/plans/_index.md) to meet your needs.

content/manuals/admin/organization/setup/onboard.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ receive your Docker subscription benefits.
7373

7474
1. Identify the Docker users in your organization.
7575
- If your organization uses device management software, like MDM or Jamf,
76-
you can use the device management software to help identify Docker users.
77-
See your device management software's documentation for details. You can
78-
identify Docker users by checking if Docker Desktop is installed at the
79-
following location on each user's machine:
80-
- Mac: `/Applications/Docker.app`
81-
- Windows: `C:\Program Files\Docker\Docker`(all-user installation) or `%LOCALAPPDATA%\Programs\DockerDesktop` (per-user installation (Beta))
82-
- Linux: `/opt/docker-desktop`
76+
you can use the device management software to help identify Docker users.
77+
See your device management software's documentation for details. You can
78+
identify Docker users by checking if Docker Desktop is installed at the
79+
following location on each user's machine:
80+
- Mac: `/Applications/Docker.app`
81+
- Windows: `C:\Program Files\Docker\Docker`(all-user installation) or `%LOCALAPPDATA%\Programs\DockerDesktop` (per-user installation (Beta))
82+
- Linux: `/opt/docker-desktop`
8383
- If your organization doesn't use device management software or your
8484
users haven't installed Docker Desktop yet, you can survey your users to
8585
identify who is using Docker Desktop.
@@ -122,7 +122,7 @@ For more details, see [Invite members](/manuals/admin/organization/manage/member
122122

123123
Configuring SSO and SCIM is optional and only available to Docker Business
124124
subscribers. To upgrade a Docker Team subscription to a Docker Business
125-
subscription, see [Change your subscription](/manuals/subscription/change.md).
125+
subscription, see [Upgrade a plan](/manuals/subscription/manage.md#upgrade-plans).
126126

127127
Use your identity provider (IdP) to manage members and provision them to Docker
128128
automatically via SSO and SCIM. See the following for more details:

content/manuals/admin/organization/setup/orgs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ the following steps:
7474
1. Based on the number of seats from the secondary organization, [purchase additional seats](../manage/manage-seats.md) for the primary organization account that you want to keep.
7575
1. Manually add users to the primary organization and remove existing users from the secondary organization.
7676
1. Manually move over your data, including all repositories.
77-
1. Once you're done moving all of your users and data, [downgrade](../../../subscription/change.md) the secondary account to a free subscription. Note that Docker does not offer refunds for downgrading organizations mid-billing cycle.
77+
1. Once you're done moving all of your users and data, [downgrade](../../../subscription/plans/docker.md#cancel-a-docker-plan) the secondary account to a free subscription. Note that Docker does not offer refunds for downgrading organizations mid-billing cycle.
7878

7979
If your organization has a Docker Business subscription with a purchase
8080
order, contact Support or your Account Manager at Docker.

0 commit comments

Comments
 (0)