Skip to content
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .markdownlint.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"ol-prefix": {"style": "ordered"},
"no-reversed-links": true,
"reference-links-images": {
"shortcut_syntax": true
"shortcut_syntax": false
},
"fenced-code-language": true,
"table-pipe-style": true,
Expand Down
70 changes: 0 additions & 70 deletions assets/css/callouts.css

This file was deleted.

1 change: 0 additions & 1 deletion assets/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
@import "tailwindcss/components";
@import "/assets/css/code";
@import "/assets/css/toc";
@import "/assets/css/callouts";
@import "/assets/css/kapa";

@import "tailwindcss/utilities";
Expand Down
2 changes: 1 addition & 1 deletion content/accounts/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ You can create a Docker account to secure a Docker ID, which is a username for y

In this section, explore how you can create, manage, or update your account.

{{< grid >}}
{{< grid >}}
14 changes: 5 additions & 9 deletions content/accounts/create-account.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ You can create a free Docker account with your email address or by signing up wi

Your Docker ID becomes your username for hosted Docker services, and [Docker forums](https://forums.docker.com/).

> **Tip**
> [!TIP]
>
> Explore [Docker's core subscriptions](https://www.docker.com/pricing/) to see what else Docker can offer you.
{ .tip }

## Create a Docker ID

Expand All @@ -37,16 +36,15 @@ Your Docker ID becomes your username for hosted Docker services, and [Docker for

6. Verify your email address to complete the registration process.

> **Note**
> [!NOTE]
>
> You have limited actions available until you verify your email address.

### Sign up with Google or GitHub

> **Important**
> [!IMPORTANT]
>
> To sign up with your social provider, make sure you verify your email address with your provider before you begin.
{ .important }

1. Go to the [Docker sign-up page](https://app.docker.com/signup/).

Expand All @@ -68,20 +66,18 @@ Once you register and verify your Docker ID email address, you can sign in to [y

You can also sign in through the CLI using the `docker login` command. For more information, see [`docker login`](../reference/cli/docker/login.md).

> **Warning**
> [!WARNING]
>
> When you use the `docker login` command, your credentials are
stored in your home directory in `.docker/config.json`. The password is base64-encoded in this file.
>
> We recommend using one of the [Docker credential helpers](https://github.com/docker/docker-credential-helpers) for secure storage of passwords. For extra security, you can also use a [personal access token](../security/for-developers/access-tokens.md) to log in instead, which is still encoded in this file (without a Docker credential helper) but doesn't allow admin actions (such as changing the password).
{ .warning }

### Sign in with your social provider

> **Important**
> [!IMPORTANT]
>
> To sign in with your social provider, make sure you verify your email address with your provider before you begin.
{ .important }

Optionally, you can sign in to an existing Docker account with your Google or GitHub account. If a Docker account exists with the same email address as the primary email for your social provider, your Docker account will automatically be linked to the social profile. This lets you sign in with your social provider.

Expand Down
6 changes: 2 additions & 4 deletions content/accounts/deactivate-user-account.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ You can deactivate an account at any time. This section describes the prerequisi
>**Warning**
>
> All Docker products and services that use your Docker account will be inaccessible after deactivating your account.
{ .warning }
## Prerequisites

Expand Down Expand Up @@ -38,13 +37,12 @@ Before deactivating your Docker account, ensure that you meet the following requ

Once you have completed all the previous steps, you can deactivate your account.

> **Warning**
> [!WARNING]
>
> This cannot be undone. Be sure you've gathered all the data you need from your account before deactivating it.
{ .warning }
1. Sign in to your [Docker account](https://app.docker.com/login).
2. In Docker Home, select your avatar in the top-right corner to open the drop-down.
3. Select **Account settings**.
4. In the **Account management** section, select **Deactivate account** to open to deactivate account page.
5. To confirm, select **Deactivate account**.
5. To confirm, select **Deactivate account**.
5 changes: 2 additions & 3 deletions content/accounts/manage-account.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ title: Manage your Docker account

You can centrally manage the settings for your Docker account. Here you can also take administrative actions for your account and manage your account security.

> **Tip**
> [!TIP]
>
> If your account is associated with an organization that enforces single sign-on (SSO), you may not have permissions to update your account settings. You need to contact your administrator to update your settings.
{ .tip }

## Update general settings

Expand Down Expand Up @@ -65,4 +64,4 @@ You can take administrative actions for your account in Docker Home.

For more information on converting your account, see [Convert an account into an organization](../admin/convert-account.md).

For information on deactivating your account, see [Deactivating a user account](./deactivate-user-account.md).
For information on deactivating your account, see [Deactivating a user account](./deactivate-user-account.md).
2 changes: 1 addition & 1 deletion content/admin/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ The Docker Admin Console is available in [Early Access](../release-lifecycle.md#
- Team: A team is a group of Docker members that belong to an organization. Organization and company owners can group members into additional teams to configure repository permissions on a per-team basis. Using teams to group members is optional.
- Member: A member is a Docker user that's a member of an organization. Organization and company owners can assign roles to members to define their permissions.

{{< grid >}}
{{< grid >}}
2 changes: 1 addition & 1 deletion content/admin/company/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ aliases:

Learn how to administer a company in the following sections.

{{< grid >}}
{{< grid >}}
6 changes: 2 additions & 4 deletions content/admin/company/new-company.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ To create a new company:
3. Near the bottom of the **General** tab, select **Create a company**.
4. Enter a unique name for your company, then select **Continue**.

> **Tip**
> [!TIP]
>
> The name for your company can't be the same as an existing user, organization, or company namespace.
{ .tip }

5. Review the company migration details and then select **Create company**.

Expand All @@ -43,10 +42,9 @@ To create a new company:
3. Select **Create a company**.
4. Enter a unique name for your company, then select **Continue**.

> **Tip**
> [!TIP]
>
> The name for your company can't be the same as an existing user, organization, or company namespace.
{ .tip }

5. Review the company migration details and then select **Create company**.

Expand Down
4 changes: 0 additions & 4 deletions content/admin/company/organizations.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@ You can manage the organizations in a company in Docker Hub and the Docker Admin
>**Important**
>
> You must be a company owner to add an organization to a company. You must also be an organization owner of the organization you want to add.
{ .important }
There is no limit to the number of organizations you can have under a company layer. All organizations must have a Business subscription.

>**Important**
>
> Once you add an organization to a company, you can't remove it from the company.
{ .important }
1. In Docker Hub, select **Organizations**.
2. Select your company.
Expand Down Expand Up @@ -60,14 +58,12 @@ When you have a [self-serve](../../subscription/core-subscription/details.md#sel
>**Important**
>
> You must be a company owner to add an organization to a company. You must also be an organization owner of the organization you want to add.
{ .important }
There is no limit to the number of organizations you can have under a company layer. All organizations must have a Business subscription.

>**Important**
>
> Once you add an organization to a company, you can't remove it from the company.
{ .important }
1. Sign in to the [Admin Console](https://admin.docker.com).
2. In the left navigation, select your company in the drop-down menu.
Expand Down
2 changes: 1 addition & 1 deletion content/admin/company/owners.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ Once you've added the new owner, you can view the user in the **Company owners**
5. Select **Remove as company owner**.

{{< /tab >}}
{{< /tabs >}}
{{< /tabs >}}
3 changes: 1 addition & 2 deletions content/admin/convert-account.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ You can convert an existing user account to an organization. This is useful if y

When you convert a user account to an organization, the account is migrated to a Docker Team plan.

> **Important**
> [!IMPORTANT]
>
> Once you convert your account to an organization, you can’t revert it to a user account.
{ .important }

## Prerequisites

Expand Down
4 changes: 1 addition & 3 deletions content/admin/deactivate-account.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ You can deactivate an account at any time. This section describes the prerequisi
>**Warning**
>
> All Docker products and services that use your Docker account or organization account will be inaccessible after deactivating your account.
{ .warning }
## Prerequisites

Expand All @@ -32,10 +31,9 @@ Before deactivating an organization, complete the following:

Once you have completed all the previous steps, you can deactivate your organization.

> **Warning**
> [!WARNING]
>
> This cannot be undone. Be sure you've gathered all the data you need from your organization before deactivating it.
{ .warning }
{{< tabs >}}
{{< tab name="Admin Console" >}}
Expand Down
2 changes: 1 addition & 1 deletion content/admin/organization/activity-logs.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ For example, activity logs display activities such as the date when a repository

Owners can also see the activity logs for their repository if the repository is part of the organization subscribed to a Docker Business or Team plan.

> **Note**
> [!NOTE]
>
> Activity logs requires a [Docker Team or Business subscription](../../../subscription/_index.md).

Expand Down
2 changes: 1 addition & 1 deletion content/admin/organization/manage-a-team.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ you automatically have "Read-only" permissions:
| Trigger Builds | ❌ | ✅ | ✅ |
| Edit Build Settings | ❌ | ❌ | ✅ |

> **Note**
> [!NOTE]
>
> A user who hasn't verified their email address only has
> `Read-only` access to the repository, regardless of the rights their team
Expand Down
6 changes: 3 additions & 3 deletions content/admin/organization/members.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ To add a member to a team:
2. Select **Organizations**, your organization, and then **Members**.
3. Select the **Action** icon, and then select **Add to team**.

> **Note**
> [!NOTE]
>
> You can also navigate to **Organizations** > **Your Organization** > **Teams** > **Your Team Name** and select **Add Member**. Select a member from the drop-down list to add them to the team or search by Docker ID or email.
4. Select the team and then select **Add**.

> **Note**
> [!NOTE]
>
> An invitee must first accept the invitation to join the organization before being added to the team.

Expand All @@ -60,7 +60,7 @@ To add a member to a team:
2. Select the team name.
3. Select **Add member**. You can add the member by searching for their email address or username.

> **Note**
> [!NOTE]
>
> An invitee must first accept the invitation to join the organization before being added to the team.

Expand Down
9 changes: 4 additions & 5 deletions content/admin/organization/orgs.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ To create an organization:
[Docker Pricing](https://www.docker.com/pricing/)
for details on the features offered in the Team and Business plan.

> **Note**
> [!NOTE]
>
> Selecting **Buy Now** isn't an obligation to pay. You can complete
> this step without incurring a payment.
Expand All @@ -39,7 +39,7 @@ for details on the features offered in the Team and Business plan.
your organization in Docker Hub. It's not possible to change the name of the
organization after you've created it.

> **Note**
> [!NOTE]
>
> You can't use the same name for the organization and your Docker ID. If you want to use your Docker ID as the organization name, then you must first [convert your account into an organization](../convert-account.md).

Expand All @@ -63,7 +63,7 @@ To view an organization:
1. Sign in to Docker Hub with a user account that is a member of any team in the
organization.

> **Note**
> [!NOTE]
>
> You can't _directly_ log in to an organization. This is especially
> important to note if you create an organization by
Expand Down Expand Up @@ -114,11 +114,10 @@ If you have multiple organizations that you want to merge into one, complete the
3. Manually move over your data, including all repositories.
4. Once you're done moving all of your users and data, [downgrade](../../subscription/core-subscription/downgrade.md) the secondary account to a free subscription.

> **Tip**
> [!TIP]
>
> If your organization has a Docker Core Business subscription with a purchase order, contact Support or your Account Manager at Docker.
>
{ .tip }

## More resources

Expand Down
5 changes: 2 additions & 3 deletions content/billing/3d-secure.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Learn about 3D Secure support for Docker billing.
keywords: billing, renewal, payments, subscriptions
---

> **Note**
> [!NOTE]
>
> [Docker Core subscription](/billing/core-billing/get-started-core/) payments support 3D secure authentication.

Expand All @@ -25,7 +25,6 @@ If you encounter errors completing payments due to 3DS, you can troubleshoot in
2. Contact your bank to determine any errors on their end.
3. Try a different payment method that doesn’t require 3DS.

> **Tip**
> [!TIP]
>
> Make sure you allow third-party scripts in your browser and that any ad blocker you may use is disabled when attempting to complete payments.
{ .tip }
Loading