From 60efcb6980f1ea69e3452f1bd823180e1044e4e9 Mon Sep 17 00:00:00 2001 From: Stephanie Aurelio Date: Wed, 13 Mar 2024 14:50:18 -0700 Subject: [PATCH 1/4] update billing and add new sub docs --- content/billing/build-billing.md | 30 ++++++++++++- content/build/cloud/_index.md | 2 +- content/subscription/_index.md | 2 +- .../{ => build-cloud}/build-details.md | 16 ++++--- .../subscription/build-cloud/manage-seats.md | 43 +++++++++++++++++++ .../subscription/core-subscription/details.md | 2 +- data/toc.yaml | 12 ++++-- 7 files changed, 92 insertions(+), 15 deletions(-) rename content/subscription/{ => build-cloud}/build-details.md (55%) create mode 100644 content/subscription/build-cloud/manage-seats.md diff --git a/content/billing/build-billing.md b/content/billing/build-billing.md index c36a3356aa03..eefa14f4c8b8 100644 --- a/content/billing/build-billing.md +++ b/content/billing/build-billing.md @@ -6,13 +6,22 @@ keywords: payments, billing, subscription, build, cloud, Build Cloud, remote bui Build Cloud is a next-gen build tool that enables improved build speed, a shared build cache, and native multi-platform builds. Build Cloud is available for free with an existing Docker subscription. To get additional seats and increase your available build minutes, you can buy a subscription to enhance your builds. -In this section, learn how to set up and manage billing for your Build Cloud subscription. For more information about the subscription tiers, see [Build Cloud subscriptions and features](../subscription/build-details.md). +If you don’t have a Docker Core subscription, you can buy Docker Build Cloud Team and create a team in Docker Build Cloud. + +> **Tip** +> +> You can create a free Docker Personal account and [try Docker Build Cloud for free](/subscription/build-cloud/build-details#docker-personal). Team benefits aren't included. +{ .tip } + +In this section, learn how to set up and manage billing for your Build Cloud subscription. For more information about the subscription tiers, see [Build Cloud subscriptions and features](/subscription/build-cloud/build-details). ## Buy your subscription +### Existing account or organization + You can buy a Build Cloud subscription on a monthly or annual plan. -1. Go to the [Docker Build Cloud dashboard](https://build.docker.com/). If you're not already signed in to your Docker account, do so now. +1. Sign in to your [Docker account](https://login.docker.com/) and go to [Docker Build Cloud](https://build.docker.com/). 2. Choose the user account you want to use to subscribe. This can be a personal account, or an organization account. To buy a subscription for an organization, you need to be an organization owner. 3. Review the plans, then select **Buy now**. 4. For organizations: Select the number of seats you want to buy, then select **Continue to payment**. @@ -20,6 +29,23 @@ You can buy a Build Cloud subscription on a monthly or annual plan. Subscription renewals charge to the default payment method. +### New organization + +You can buy a Docker Build Cloud Team subscription if you haven’t created an organization yet. To do so, you can create a team in Docker Build Cloud. + +> **Note** +> +> To create a new organization and start a Docker Build Cloud Team subscription, you need a personal Docker account. You can [sign up](https://hub.docker.com/signup) for free. + +1. Sign in to your [Docker account](https://login.docker.com/) and go to [Docker Build Cloud](https://build.docker.com/). +2. Select **Create a new team**. +3. On the **Build Cloud Team** card, select **Buy now**. +4. To create your team, enter an organization namespace, company name, and the number of seats you want to buy. +5. Select **Continue to payment**. +6. Follow the on-screen instructions to buy your subscription. + +When your payment is complete, you’ll be redirected to the dashboard for your new team in Docker Build Cloud. Here, you can [invite users](/subscription/build-cloud/manage-seats/) to your team. + ## View billing history and manage your billing information You can view your billing history at any time. diff --git a/content/build/cloud/_index.md b/content/build/cloud/_index.md index e8b9b370022b..3605c31c91d3 100644 --- a/content/build/cloud/_index.md +++ b/content/build/cloud/_index.md @@ -64,6 +64,6 @@ Once you've signed up and created a builder, continue by [setting up the builder in your local environment](./setup.md). For more information about the available subscription plans, see -[Docker Build Cloud subscriptions and features](../../subscription/build-details.md). +[Docker Build Cloud subscriptions and features](../../subscription/build-cloud/build-details.md). For information about roles and permissions related to Docker Build Cloud, see [Roles and Permissions](../../security/for-admins/roles-and-permissions.md#docker-build-cloud). diff --git a/content/subscription/_index.md b/content/subscription/_index.md index 1652b671cd61..b1b365aaba51 100644 --- a/content/subscription/_index.md +++ b/content/subscription/_index.md @@ -13,7 +13,7 @@ grid_subscriptions: icon: query_stats - title: Docker Build Cloud subscriptions and features description: Learn how a Docker Build Cloud subscription can accelerate your builds. - link: /subscription/build-details/ + link: /subscription/build-cloud/build-details/ icon: build grid_core: - title: Upgrade your subscription diff --git a/content/subscription/build-details.md b/content/subscription/build-cloud/build-details.md similarity index 55% rename from content/subscription/build-details.md rename to content/subscription/build-cloud/build-details.md index b90b48ced21b..82b680645326 100644 --- a/content/subscription/build-details.md +++ b/content/subscription/build-cloud/build-details.md @@ -1,14 +1,16 @@ --- -title: Docker Build Cloud subscriptions and features +title: Subscriptions and features description: Learn about the Docker Build Cloud subscriptions plans and features keywords: subscription, pro, team, business, features, build, cloud, Build Cloud, remote builder +aliases: +- /subscription/build-details/ --- You can enhance your teams' builds with a Build Cloud subscription. This page describes the features available for the different subscription tiers. To compare features available for each tier, see [Docker Build Cloud pricing](https://www.docker.com/products/build-cloud/#pricing). ## Docker Build Cloud Starter -If you have an existing [Docker Core subscription](../subscription/core-subscription/details.md), a base level of Build Cloud minutes and cache are included. The features available vary depending on your Docker Core subscription tier. +If you have an existing [Docker Core subscription](/subscription/core-subscription/details/), a base level of Build Cloud minutes and cache are included. The features available vary depending on your Docker Core subscription tier. ### Docker Personal @@ -35,18 +37,20 @@ If you have an existing [Docker Core subscription](../subscription/core-subscrip ## Docker Build Cloud Team -You can upgrade any tier to enhance your developers' experience with the following features: +You can buy Docker Build Cloud Team if you don’t have a Docker Core subscription, or upgrade any Docker Core tier to enhance your developers' experience with the following features: - 200 additional build minutes per seat - Option to buy reserve minutes - Increased shared cache The Docker Build Cloud Team subscription is tied to a Docker -[organization](../admin/organization/_index.md). To use the build minutes or +[organization](/admin/organization/). To use the build minutes or shared cache of a Docker Build Cloud Team subscription, users must be a part of -the organization associated with the subscription. +the organization associated with the subscription. See Manage seats and invites. -To learn how to buy this subscription, see [Docker Build Cloud billing](../billing/build-billing.md). +To learn how to buy this subscription for your Docker organization, see [Buy your subscription - Existing account or organization](/billing/build-billing#existing-account-or-organization). + +If you haven’t created a Docker organization yet and don’t have an existing Docker Core subscription, see [Buy your subscription - new organization](/billing/build-billing#new-organization). For organizations without a Docker Core subscription, this plan also includes 50 shared minutes in addition to the Docker Build Cloud Team minutes. ## Docker Build Cloud Enterprise diff --git a/content/subscription/build-cloud/manage-seats.md b/content/subscription/build-cloud/manage-seats.md new file mode 100644 index 000000000000..0e6636992ca3 --- /dev/null +++ b/content/subscription/build-cloud/manage-seats.md @@ -0,0 +1,43 @@ +--- +title: Manage seats and invites +description: Learn how to add and remove seats for your Docker Build Cloud subscription, and invite members to your team. +keywords: subscription, team, business, features, build, cloud, Build Cloud, remote builder, manage users, add seats, remove seats +--- + +You can add seats and manage invitations to your Docker Build Cloud Team in the Docker Build Cloud dashboard. + +> **Note** +> +>If you have a Docker Build Cloud Business subscription, you can add and remove seats by working with your account executive, then assign your purchased seats in the Docker Build Cloud dashboard. + +## Add seats + +1. Sign in to your [Docker account](https://login.docker.com/) and go to [Docker Build Cloud](https://build.docker.com/). +2. Select **Settings & billing**. +3. Under your current plan, select **Add seats**. +4. Select the number of seats you want to add, then select **Add seats**. + +The number of seats will be charged to your payment information on file, and are added immediately. + +## Remove seats + +1. Sign in to your [Docker account](https://login.docker.com/) and go to [Docker Build Cloud](https://build.docker.com/). +2. Select **Settings & billing**. +3. Under your current plan, select **Remove seats**. +4. Enter the total number of seats you want to keep on your plan, then select **Remove seats**. + +The charge for the reduced seat count will be reflected on the next billing cycle. Optionally, you can cancel the seat downgrade any time before the next billing cycle. + +## Invite users + +As an owner of the Docker Build Cloud team, you can invite members to access cloud builders. To invite team members to your team in Docker Build Cloud: + +1. Sign in to your [Docker account](https://login.docker.com/) and go to [Docker Build Cloud](https://build.docker.com/). +2. Select **User management**. +3. Select **Invite**. +4. Enter the email address or Docker ID of the member you want to invite. If the invitee doesn’t have a Docker ID, you need to enter their email address so they can create an account when they accept the invite. +5. Select **Add**. + +Invitees receive an email with instructions on how they can accept the invite. After they accept, the seat will be marked as **Allocated** in the **User management** section in the Docker Build Cloud dashboard. + +For more information on the permissions granted to members, see Roles and permissions - Docker Build Cloud. diff --git a/content/subscription/core-subscription/details.md b/content/subscription/core-subscription/details.md index 88b3c8bbb8ea..5d15dc386756 100644 --- a/content/subscription/core-subscription/details.md +++ b/content/subscription/core-subscription/details.md @@ -14,7 +14,7 @@ The following describes some of the key features included with your Docker Core 3 Docker Scout-enabled repositories for advanced remote image analysis. You can purchase a Docker Scout subscription to enable more repositories. See [Docker Scout subscriptions and features](../scout-details.md). -Docker Build Cloud minutes are also included. For more information, see [Docker Build Cloud subscriptions and features](../build-details.md). +Docker Build Cloud minutes are also included. For more information, see [Docker Build Cloud subscriptions and features](../build-cloud/build-details.md). Docker maintains a [public roadmap](https://github.com/docker/roadmap) so subscribers can see what new features are in development, as well as request new capabilities. diff --git a/data/toc.yaml b/data/toc.yaml index 67de7f7bfed7..829b23c5ae8b 100644 --- a/data/toc.yaml +++ b/data/toc.yaml @@ -2166,12 +2166,16 @@ Manuals: title: Remove seats - path: /subscription/core-subscription/downgrade/ title: Downgrade - - path: /subscription/desktop-license/ - title: Docker Desktop license agreement + - sectiontitle: Docker Build Cloud + section: + - path: /subscription/build-cloud/build-details/ + title: Subscriptions and features + - path: /subscription/build-cloud/manage-seats/ + title: Manage seats and invites - path: /subscription/scout-details/ title: Docker Scout subscriptions and features - - path: /subscription/build-details/ - title: Docker Build Cloud subscriptions and features + - path: /subscription/desktop-license/ + title: Docker Desktop license agreement - sectiontitle: Trusted content section: From 12fd731cf75d271d9f41c385f3dee8c1a8022f71 Mon Sep 17 00:00:00 2001 From: Stephanie Aurelio Date: Wed, 13 Mar 2024 15:51:00 -0700 Subject: [PATCH 2/4] refine order in toc --- content/billing/build-billing.md | 12 ++++++------ content/subscription/build-cloud/manage-seats.md | 4 ++-- data/toc.yaml | 5 ++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/content/billing/build-billing.md b/content/billing/build-billing.md index eefa14f4c8b8..3a82cd9f062a 100644 --- a/content/billing/build-billing.md +++ b/content/billing/build-billing.md @@ -17,11 +17,11 @@ In this section, learn how to set up and manage billing for your Build Cloud sub ## Buy your subscription -### Existing account or organization - You can buy a Build Cloud subscription on a monthly or annual plan. -1. Sign in to your [Docker account](https://login.docker.com/) and go to [Docker Build Cloud](https://build.docker.com/). +### Existing account or organization + +1. Sign in to your [Docker account](https:/hub.docker.com/login) and go to [Docker Build Cloud](https://build.docker.com/). 2. Choose the user account you want to use to subscribe. This can be a personal account, or an organization account. To buy a subscription for an organization, you need to be an organization owner. 3. Review the plans, then select **Buy now**. 4. For organizations: Select the number of seats you want to buy, then select **Continue to payment**. @@ -37,7 +37,7 @@ You can buy a Docker Build Cloud Team subscription if you haven’t created an o > > To create a new organization and start a Docker Build Cloud Team subscription, you need a personal Docker account. You can [sign up](https://hub.docker.com/signup) for free. -1. Sign in to your [Docker account](https://login.docker.com/) and go to [Docker Build Cloud](https://build.docker.com/). +1. Sign in to your [Docker account](https:/hub.docker.com/login) and go to [Docker Build Cloud](https://build.docker.com/). 2. Select **Create a new team**. 3. On the **Build Cloud Team** card, select **Buy now**. 4. To create your team, enter an organization namespace, company name, and the number of seats you want to buy. @@ -50,7 +50,7 @@ When your payment is complete, you’ll be redirected to the dashboard for your You can view your billing history at any time. -1. Sign in to your Docker account and go to the [Docker Build Cloud dashboard](https://build.docker.com/). +1. Sign in to your [Docker account](https:/hub.docker.com/login) and go to [Docker Build Cloud](https://build.docker.com/). 2. Select **Settings and billing**. 3. Select the **Payment methods and billing history** link to go to the billing portal. @@ -60,7 +60,7 @@ Here you can find your invoice history, download your invoices, and manage your You can downgrade your subscription at any time. -1. Sign in to your Docker account and go to the [Docker Build Cloud dashboard](https://build.docker.com/). +1. Sign in to your [Docker account](https:/hub.docker.com/login) and go to [Docker Build Cloud](https://build.docker.com/). 2. Select **Settings and billing**. 3. Select **Change plan**. 4. Select **Downgrade**. diff --git a/content/subscription/build-cloud/manage-seats.md b/content/subscription/build-cloud/manage-seats.md index 0e6636992ca3..cb53b3e225f1 100644 --- a/content/subscription/build-cloud/manage-seats.md +++ b/content/subscription/build-cloud/manage-seats.md @@ -21,7 +21,7 @@ The number of seats will be charged to your payment information on file, and are ## Remove seats -1. Sign in to your [Docker account](https://login.docker.com/) and go to [Docker Build Cloud](https://build.docker.com/). +1. Sign in to your [Docker account](https:/hub.docker.com/login) and go to [Docker Build Cloud](https://build.docker.com/). 2. Select **Settings & billing**. 3. Under your current plan, select **Remove seats**. 4. Enter the total number of seats you want to keep on your plan, then select **Remove seats**. @@ -32,7 +32,7 @@ The charge for the reduced seat count will be reflected on the next billing cycl As an owner of the Docker Build Cloud team, you can invite members to access cloud builders. To invite team members to your team in Docker Build Cloud: -1. Sign in to your [Docker account](https://login.docker.com/) and go to [Docker Build Cloud](https://build.docker.com/). +1. Sign in to your [Docker account](https:/hub.docker.com/login) and go to [Docker Build Cloud](https://build.docker.com/). 2. Select **User management**. 3. Select **Invite**. 4. Enter the email address or Docker ID of the member you want to invite. If the invitee doesn’t have a Docker ID, you need to enter their email address so they can create an account when they accept the invite. diff --git a/data/toc.yaml b/data/toc.yaml index 829b23c5ae8b..b7a0972b14d9 100644 --- a/data/toc.yaml +++ b/data/toc.yaml @@ -2144,11 +2144,10 @@ Manuals: title: View your billing history - path: /billing/core-billing/cycle/ title: Change your billing cycle - - path: /billing/scout-billing/ - title: Docker Scout billing - path: /billing/build-billing/ title: Docker Build Cloud billing - + - path: /billing/scout-billing/ + title: Docker Scout billing - sectiontitle: Subscription section: From 5ffb03907a3f98c51bd7f32a2fa620fd67f5c400 Mon Sep 17 00:00:00 2001 From: Stephanie Aurelio Date: Wed, 13 Mar 2024 15:54:40 -0700 Subject: [PATCH 3/4] add crosslinking --- content/subscription/build-cloud/build-details.md | 2 +- content/subscription/build-cloud/manage-seats.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/subscription/build-cloud/build-details.md b/content/subscription/build-cloud/build-details.md index 82b680645326..fc9a53c05aab 100644 --- a/content/subscription/build-cloud/build-details.md +++ b/content/subscription/build-cloud/build-details.md @@ -48,7 +48,7 @@ The Docker Build Cloud Team subscription is tied to a Docker shared cache of a Docker Build Cloud Team subscription, users must be a part of the organization associated with the subscription. See Manage seats and invites. -To learn how to buy this subscription for your Docker organization, see [Buy your subscription - Existing account or organization](/billing/build-billing#existing-account-or-organization). +To learn how to buy this subscription for your Docker organization, see [Buy your subscription - existing account or organization](/billing/build-billing#existing-account-or-organization). If you haven’t created a Docker organization yet and don’t have an existing Docker Core subscription, see [Buy your subscription - new organization](/billing/build-billing#new-organization). For organizations without a Docker Core subscription, this plan also includes 50 shared minutes in addition to the Docker Build Cloud Team minutes. diff --git a/content/subscription/build-cloud/manage-seats.md b/content/subscription/build-cloud/manage-seats.md index cb53b3e225f1..941d28e27162 100644 --- a/content/subscription/build-cloud/manage-seats.md +++ b/content/subscription/build-cloud/manage-seats.md @@ -40,4 +40,4 @@ As an owner of the Docker Build Cloud team, you can invite members to access clo Invitees receive an email with instructions on how they can accept the invite. After they accept, the seat will be marked as **Allocated** in the **User management** section in the Docker Build Cloud dashboard. -For more information on the permissions granted to members, see Roles and permissions - Docker Build Cloud. +For more information on the permissions granted to members, see [Roles and permissions](/security/for-admins/roles-and-permissions#docker-build-cloud). From c61ec9da37a9915d6eb4e69b73e0acc399ebf46d Mon Sep 17 00:00:00 2001 From: Stephanie Aurelio Date: Thu, 14 Mar 2024 08:29:25 -0700 Subject: [PATCH 4/4] update sign in step and reword invite step --- content/billing/build-billing.md | 8 ++++---- content/subscription/build-cloud/manage-seats.md | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/content/billing/build-billing.md b/content/billing/build-billing.md index 3a82cd9f062a..f3c1442088aa 100644 --- a/content/billing/build-billing.md +++ b/content/billing/build-billing.md @@ -21,7 +21,7 @@ You can buy a Build Cloud subscription on a monthly or annual plan. ### Existing account or organization -1. Sign in to your [Docker account](https:/hub.docker.com/login) and go to [Docker Build Cloud](https://build.docker.com/). +1. Sign in to [Docker Build Cloud](https://build.docker.com/). 2. Choose the user account you want to use to subscribe. This can be a personal account, or an organization account. To buy a subscription for an organization, you need to be an organization owner. 3. Review the plans, then select **Buy now**. 4. For organizations: Select the number of seats you want to buy, then select **Continue to payment**. @@ -37,7 +37,7 @@ You can buy a Docker Build Cloud Team subscription if you haven’t created an o > > To create a new organization and start a Docker Build Cloud Team subscription, you need a personal Docker account. You can [sign up](https://hub.docker.com/signup) for free. -1. Sign in to your [Docker account](https:/hub.docker.com/login) and go to [Docker Build Cloud](https://build.docker.com/). +1. Sign in to [Docker Build Cloud](https://build.docker.com/). 2. Select **Create a new team**. 3. On the **Build Cloud Team** card, select **Buy now**. 4. To create your team, enter an organization namespace, company name, and the number of seats you want to buy. @@ -50,7 +50,7 @@ When your payment is complete, you’ll be redirected to the dashboard for your You can view your billing history at any time. -1. Sign in to your [Docker account](https:/hub.docker.com/login) and go to [Docker Build Cloud](https://build.docker.com/). +1. Sign in to [Docker Build Cloud](https://build.docker.com/). 2. Select **Settings and billing**. 3. Select the **Payment methods and billing history** link to go to the billing portal. @@ -60,7 +60,7 @@ Here you can find your invoice history, download your invoices, and manage your You can downgrade your subscription at any time. -1. Sign in to your [Docker account](https:/hub.docker.com/login) and go to [Docker Build Cloud](https://build.docker.com/). +1. Sign in to [Docker Build Cloud](https://build.docker.com/). 2. Select **Settings and billing**. 3. Select **Change plan**. 4. Select **Downgrade**. diff --git a/content/subscription/build-cloud/manage-seats.md b/content/subscription/build-cloud/manage-seats.md index 941d28e27162..c45ebfa6de13 100644 --- a/content/subscription/build-cloud/manage-seats.md +++ b/content/subscription/build-cloud/manage-seats.md @@ -12,7 +12,7 @@ You can add seats and manage invitations to your Docker Build Cloud Team in the ## Add seats -1. Sign in to your [Docker account](https://login.docker.com/) and go to [Docker Build Cloud](https://build.docker.com/). +1. Sign in to [Docker Build Cloud](https://build.docker.com/). 2. Select **Settings & billing**. 3. Under your current plan, select **Add seats**. 4. Select the number of seats you want to add, then select **Add seats**. @@ -21,7 +21,7 @@ The number of seats will be charged to your payment information on file, and are ## Remove seats -1. Sign in to your [Docker account](https:/hub.docker.com/login) and go to [Docker Build Cloud](https://build.docker.com/). +1. Sign in to [Docker Build Cloud](https://build.docker.com/). 2. Select **Settings & billing**. 3. Under your current plan, select **Remove seats**. 4. Enter the total number of seats you want to keep on your plan, then select **Remove seats**. @@ -32,10 +32,10 @@ The charge for the reduced seat count will be reflected on the next billing cycl As an owner of the Docker Build Cloud team, you can invite members to access cloud builders. To invite team members to your team in Docker Build Cloud: -1. Sign in to your [Docker account](https:/hub.docker.com/login) and go to [Docker Build Cloud](https://build.docker.com/). +1. Sign in to [Docker Build Cloud](https://build.docker.com/). 2. Select **User management**. 3. Select **Invite**. -4. Enter the email address or Docker ID of the member you want to invite. If the invitee doesn’t have a Docker ID, you need to enter their email address so they can create an account when they accept the invite. +4. Enter the email address or Docker ID of the member you want to invite. If the invitee doesn’t have a Docker ID yet, enter their email address so they can create an account when they accept the invite. 5. Select **Add**. Invitees receive an email with instructions on how they can accept the invite. After they accept, the seat will be marked as **Allocated** in the **User management** section in the Docker Build Cloud dashboard.