mirror of
https://github.com/docker/docs.git
synced 2026-03-27 14:28:47 +07:00
Remove call outs per style guide (#24238)
This PR captures work for docs in BRIDGE that have >2 but <5 CTAs per
doc.
* Keep most pertinent/urgent/helpful CTAs with a maximum of ~~2~~ 3.
* Some CTAs include security info that should be privileged / override
style guidance
* I've limited scope for this PR to address docs with 4-5 CTAs per doc.
* Find natural home for other CTAs, careful to ensure that the
information is still prominent as the CTAs were likely added because
users need that information.
Follow-up work:
* Some work was started on SCIM and Configure JSON, but both docs need a
deeper look into about their efficacy.
* For SCIM especially, the doc has a lot of relevant call outs.
* I want to confirm with stakeholders about possibly segmenting this doc
into smaller and more topic-focused docs within the provisioning section
* Need to find point person on legacy notices in docs
* Need to find point person on tax compliance notices, as they're quite
noisy. (Not urgent as this is just a personal preference lol)
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -17,3 +17,4 @@ cagent
|
||||
.cagent
|
||||
.pr-body.md
|
||||
.validation.log
|
||||
.claude
|
||||
|
||||
@@ -32,9 +32,7 @@ When you change your billing cycle:
|
||||
{{< tabs >}}
|
||||
{{< tab name="Docker subscription" >}}
|
||||
|
||||
> [!IMPORTANT]
|
||||
>
|
||||
> Pay by invoice is not available for subscription upgrades or changes.
|
||||
Pay by invoice is not available for subscription upgrades or changes.
|
||||
|
||||
To change your billing cycle:
|
||||
|
||||
@@ -44,13 +42,7 @@ To change your billing cycle:
|
||||
1. On the plans and usage page, select **Switch to annual billing**.
|
||||
1. Verify your billing information.
|
||||
1. Select **Continue to payment**.
|
||||
1. Verify payment information and select **Upgrade subscription**.
|
||||
|
||||
> [!NOTE]
|
||||
>
|
||||
> If you choose to pay using a US bank account, you must verify the account. For
|
||||
> more information, see
|
||||
> [Verify a bank account](/manuals/billing/payment-method.md#verify-a-bank-account).
|
||||
1. Verify payment information and select **Upgrade subscription**. If you choose to pay using a US bank account, you must verify the account. For more information, see [Verify a bank account](/manuals/billing/payment-method.md#verify-a-bank-account).
|
||||
|
||||
The billing plans and usage page will now reflect your new annual plan details.
|
||||
|
||||
@@ -76,9 +68,7 @@ You must be an organization owner to make changes to the payment information.
|
||||
{{< tabs >}}
|
||||
{{< tab name="Docker subscription" >}}
|
||||
|
||||
> [!IMPORTANT]
|
||||
>
|
||||
> Pay by invoice is not available for subscription upgrades or changes.
|
||||
Pay by invoice is not available for subscription upgrades or changes.
|
||||
|
||||
Follow these steps to switch from a monthly to annual billing cycle for your
|
||||
organization's Docker subscription:
|
||||
@@ -89,13 +79,8 @@ organization's Docker subscription:
|
||||
1. On the plans and usage page, select **Switch to annual billing**.
|
||||
1. Verify your billing information.
|
||||
1. Select **Continue to payment**.
|
||||
1. Verify payment information and select **Upgrade subscription**.
|
||||
1. Verify payment information and select **Upgrade subscription**. If you choose to pay using a US bank account, you must verify the account. For more information, see [Verify a bank account](/manuals/billing/payment-method.md#verify-a-bank-account).
|
||||
|
||||
> [!NOTE]
|
||||
>
|
||||
> If you choose to pay using a US bank account, you must verify the account. For
|
||||
> more information, see
|
||||
> [Verify a bank account](/manuals/billing/payment-method.md#verify-a-bank-account).
|
||||
|
||||
{{< /tab >}}
|
||||
{{< tab name="Legacy Docker subscription" >}}
|
||||
|
||||
@@ -71,9 +71,7 @@ Non-interactive installations are silent and any additional configuration must b
|
||||
|
||||
### Common installation commands
|
||||
|
||||
> [!IMPORTANT]
|
||||
>
|
||||
> Admin rights are required to run any of the following commands.
|
||||
Admin rights are required to run any of the following commands.
|
||||
|
||||
#### Install interactively with verbose logging
|
||||
|
||||
@@ -199,9 +197,7 @@ msiexec /x "DockerDesktop.msi" /quiet
|
||||
|
||||
### Configuration options
|
||||
|
||||
> [!IMPORTANT]
|
||||
>
|
||||
> In addition to the following custom properties, the Docker Desktop MSI installer also supports the standard [Windows Installer command line options](https://learn.microsoft.com/en-us/windows/win32/msi/standard-installer-command-line-options).
|
||||
In addition to the following custom properties, the Docker Desktop MSI installer also supports the standard [Windows Installer command line options](https://learn.microsoft.com/en-us/windows/win32/msi/standard-installer-command-line-options).
|
||||
|
||||
| Property | Description | Default |
|
||||
| :--- | :--- | :--- |
|
||||
|
||||
@@ -248,7 +248,7 @@ Create the `registry.json` file (UTF-8 without BOM) at the appropriate location:
|
||||
> [!TIP]
|
||||
>
|
||||
> If users have issues starting Docker Desktop after enforcing sign-in,
|
||||
they may need to update to the latest version.
|
||||
> they may need to update to the latest version.
|
||||
|
||||
{{< /tab >}}
|
||||
{{< tab name="Command line setup" >}}
|
||||
@@ -304,13 +304,9 @@ sudo hdiutil detach /Volumes/Docker
|
||||
When multiple configuration methods exist on the same system, Docker Desktop uses this precedence order:
|
||||
|
||||
1. Registry key (Windows only)
|
||||
2. Configuration profiles (macOS only)
|
||||
3. plist file (macOS only)
|
||||
4. registry.json file
|
||||
|
||||
> [!IMPORTANT]
|
||||
>
|
||||
> Docker Desktop version 4.36 and later supports multiple organizations in a single configuration. Earlier versions (4.35 and below) fail silently when multiple organizations are specified.
|
||||
1. Configuration profiles (macOS only)
|
||||
1. plist file (macOS only)
|
||||
1. registry.json file
|
||||
|
||||
## Troubleshoot sign-in enforcement
|
||||
|
||||
|
||||
@@ -15,15 +15,12 @@ weight: 10
|
||||
|
||||
Enhanced Container Isolation (ECI) prevents malicious containers from compromising Docker Desktop or the host system. It applies advanced security techniques automatically while maintaining full developer productivity and workflow compatibility.
|
||||
|
||||
ECI strengthens container isolation and locks in security configurations created by administrators, such as [Registry Access Management policies](/manuals/enterprise/security/hardened-desktop/registry-access-management.md) and [Settings Management](../settings-management/_index.md) controls.
|
||||
|
||||
> [!NOTE]
|
||||
>
|
||||
> ECI works alongside other Docker security features like reduced Linux capabilities, seccomp, and AppArmor.
|
||||
- ECI strengthens container isolation and locks in security configurations created by administrators, such as [Registry Access Management policies](/manuals/enterprise/security/hardened-desktop/registry-access-management.md) and [Settings Management](../settings-management/_index.md) controls.
|
||||
- ECI works alongside other Docker security features like reduced Linux capabilities, seccomp, and AppArmor.
|
||||
|
||||
## Who should use Enhanced Container Isolation?
|
||||
|
||||
Enhanced Container Isolation is designed for:
|
||||
ECI is designed for:
|
||||
|
||||
- Organizations that want to prevent container-based attacks and reduce security vulnerabilities in developer environments
|
||||
- Security teams that need stronger container isolation without impacting developer workflows
|
||||
@@ -32,15 +29,10 @@ Enhanced Container Isolation is designed for:
|
||||
## How Enhanced Container Isolation works
|
||||
|
||||
Docker implements ECI using the [Sysbox container runtime](https://github.com/nestybox/sysbox), a
|
||||
security-enhanced fork of the standard OCI runc runtime. When ECI is turned on, containers created through `docker run` or `docker create` automatically use Sysbox instead of runc without requiring any changes to developer workflows.
|
||||
security-enhanced fork of the standard OCI runc runtime. When ECI is turned on, containers created through `docker run` or `docker create` automatically use Sysbox instead of runc without requiring any changes to developer workflows. Docker's default runtime remains runc, but all user containers
|
||||
implicitly launch with Sysbox.
|
||||
|
||||
Even containers using the `--privileged` flag run securely with Enhanced Container Isolation, preventing them from breaching the Docker Desktop virtual machine or other containers.
|
||||
|
||||
> [!NOTE]
|
||||
>
|
||||
> When ECI is turned on, the Docker CLI `--runtime` flag is ignored.
|
||||
Docker's default runtime remains runc, but all user containers
|
||||
implicitly launch with Sysbox.
|
||||
When ECI is turned on, the Docker CLI `--runtime` flag is ignored. Even containers using the `--privileged` flag run securely with ECI, preventing them from breaching the Docker Desktop virtual machine or other containers.
|
||||
|
||||
## Key security features
|
||||
|
||||
|
||||
@@ -16,13 +16,9 @@ aliases:
|
||||
weight: 30
|
||||
---
|
||||
|
||||
{{% include "tax-compliance.md" %}}
|
||||
|
||||
You can upgrade or downgrade your Docker subscription at any time to match your changing needs. This page explains how to make subscription changes and what to expect with billing and feature access.
|
||||
|
||||
> [!NOTE]
|
||||
>
|
||||
> Legacy Docker subscribers have different interfaces for subscription changes. Legacy subscriptions apply to subscribers who last purchased or renewed before December 10, 2024. For details, see [Announcing Upgraded Docker Plans](https://www.docker.com/blog/november-2024-updated-plans-announcement/).
|
||||
{{% include "tax-compliance.md" %}}
|
||||
|
||||
## Upgrade your subscription
|
||||
|
||||
@@ -40,12 +36,7 @@ you want to upgrade.
|
||||
1. Select **Billing**.
|
||||
1. Optional. If you're upgrading from a free Personal subscription to a Team subscription and want to keep your username, [convert your user account into an organization](../admin/organization/convert-account.md).
|
||||
1. Select **Upgrade**.
|
||||
1. Follow the on-screen instructions to complete your upgrade.
|
||||
|
||||
> [!NOTE]
|
||||
>
|
||||
> If you choose to pay using a US bank account, you must verify the account. For
|
||||
> more information, see [Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account).
|
||||
1. Follow the on-screen instructions to complete your upgrade. If you choose to pay using a US bank account, you must verify the account. For more information, see [Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account).
|
||||
|
||||
{{< /tab >}}
|
||||
{{< tab name="Legacy Docker subscription" >}}
|
||||
@@ -69,13 +60,10 @@ Consider the following before downgrading:
|
||||
|
||||
For feature limits in each tier, see [Docker Pricing](https://www.docker.com/pricing).
|
||||
|
||||
|
||||
{{< tabs >}}
|
||||
{{< tab name="Docker subscription" >}}
|
||||
|
||||
> [!IMPORTANT]
|
||||
>
|
||||
> If you have a sales-assisted Docker Business subscription, contact your account manager to downgrade your subscription.
|
||||
|
||||
To downgrade your subscription:
|
||||
|
||||
1. Sign in to [Docker Home](https://app.docker.com/) and select
|
||||
@@ -87,10 +75,6 @@ the organization you want to downgrade.
|
||||
{{< /tab >}}
|
||||
{{< tab name="Legacy Docker subscription" >}}
|
||||
|
||||
> [!IMPORTANT]
|
||||
>
|
||||
> If you have a sales-assisted Docker Business subscription, contact your account manager to downgrade your subscription.
|
||||
|
||||
To downgrade your legacy Docker subscription:
|
||||
|
||||
1. Sign in to [Docker Hub](https://hub.docker.com/billing).
|
||||
@@ -109,6 +93,10 @@ To downgrade your Docker Build Cloud subscription:
|
||||
{{< /tab >}}
|
||||
{{< /tabs >}}
|
||||
|
||||
> [!IMPORTANT]
|
||||
>
|
||||
> If you have a sales-assisted Docker Business subscription, contact your account manager to downgrade your subscription.
|
||||
|
||||
## Subscription pause policy
|
||||
|
||||
You can't pause or delay a subscription. If a subscription invoice isn't paid by the due date, there's a 15-day grace period starting from the due date.
|
||||
|
||||
@@ -15,40 +15,32 @@ weight: 20
|
||||
|
||||
You can add or remove seats from your Docker Team or Business subscription at any time to accommodate team changes. When you add seats mid-billing cycle, you're charged a prorated amount for the additional seats.
|
||||
|
||||
{{% include "tax-compliance.md" %}}
|
||||
> [!IMPORTANT]
|
||||
> If you have a sales-assisted Docker Business subscription,
|
||||
> contact your account manager to add seats to your subscription.
|
||||
|
||||
## Add seats to your subscription
|
||||
|
||||
{{< tabs >}}
|
||||
{{< tab name="Docker subscription" >}}
|
||||
|
||||
> [!IMPORTANT]
|
||||
>
|
||||
> If you have a sales-assisted Docker Business subscription, contact your account manager to add seats to your subscription.
|
||||
|
||||
To add seats:
|
||||
|
||||
1. Sign in to [Docker Home](https://app.docker.com/) and select your
|
||||
organization.
|
||||
1. Select **Billing**.
|
||||
- If you choose to pay using a US bank account, you must verify the account.
|
||||
- For more information, see [Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account).
|
||||
1. Select **Add seats** and follow the on-screen instructions to complete
|
||||
adding seats. Note, you can't use pay by invoice for purchasing additional
|
||||
seats. You must use a card or US bank account.
|
||||
|
||||
> [!NOTE]
|
||||
>
|
||||
> If you choose to pay using a US bank account, you must verify the account. For
|
||||
> more information, see [Verify a bank account](manuals/billing/payment-method.md#verify-a-bank-account).
|
||||
adding seats.
|
||||
- You can't use pay by invoice for purchasing additional seats.
|
||||
- You must use a card or US bank account.
|
||||
|
||||
You can now add more members to your organization. For more information, see [Manage organization members](../admin/organization/members.md).
|
||||
|
||||
{{< /tab >}}
|
||||
{{< tab name="Legacy Docker subscription" >}}
|
||||
|
||||
> [!IMPORTANT]
|
||||
>
|
||||
> If you have a sales-assisted Docker Business subscription, contact your account manager to add seats to your subscription.
|
||||
|
||||
To add seats to your Legacy Docker subscription:
|
||||
|
||||
1. Sign in to [Docker Hub](https://hub.docker.com).
|
||||
@@ -75,14 +67,11 @@ You can remove seats from your Team or Business subscription at any time. Change
|
||||
|
||||
For example, if you're billed on the 8th of every month for 10 seats and remove 2 seats on the 15th, the 2 seats remain available until your next billing cycle. Your payment for 8 seats begins on the next billing cycle.
|
||||
|
||||
|
||||
{{< tabs >}}
|
||||
{{< tab name="Docker subscription" >}}
|
||||
|
||||
> [!IMPORTANT]
|
||||
>
|
||||
> If you have a sales-assisted Docker Business subscription, contact your account manager to remove seats from your subscription.
|
||||
|
||||
To remove seats:
|
||||
If you have a sales-assisted Docker Business subscription, contact your account manager to remove seats from your subscription. To remove seats:
|
||||
|
||||
1. Sign in to [Docker Home](https://app.docker.com/) and select your
|
||||
organization.
|
||||
@@ -95,11 +84,7 @@ You can cancel the removal of seats before your next billing cycle. To do so, se
|
||||
{{< /tab >}}
|
||||
{{< tab name="Legacy Docker subscription" >}}
|
||||
|
||||
> [!IMPORTANT]
|
||||
>
|
||||
> If you have a sales-assisted Docker Business subscription, contact your account manager to remove seats from your subscription.
|
||||
|
||||
To remove seats from your Legacy Docker subscription:
|
||||
If you have a sales-assisted Docker Business subscription, contact your account manager to remove seats from your subscription. To remove seats from your Legacy Docker subscription:
|
||||
|
||||
1. Sign in to [Docker Hub](https://hub.docker.com).
|
||||
1. Select your organization, then select **Billing**.
|
||||
|
||||
Reference in New Issue
Block a user