Skip to content

Commit

Permalink
Update overview pages and highlight scout (#18749)
Browse files Browse the repository at this point in the history
* update overview pages and highlight scout

* Implement feedback

Co-authored-by: David Karlsson <[email protected]>

* clarify use

---------

Co-authored-by: David Karlsson <[email protected]>
  • Loading branch information
stephaurelio and dvdksn authored Nov 27, 2023
1 parent 9949bc7 commit c47c4a4
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 13 deletions.
12 changes: 10 additions & 2 deletions content/billing/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,27 @@ description: Discover information on billing and payment processes for Docker su
keywords: billing, invoice, payment, subscription
grid:
- title: Add or update a payment method
description: Learn how to add or update a payment method for your personal account or organization.
link: /billing/payment-method/
icon: credit_score
- title: Update the billing information
description: Discover how to update the billing information for your personal account or organization.
link: /billing/details/
icon: contract_edit
- title: View billing history
description: Learn how to view billing history and download past invoices.
link: /billing/history/
icon: payments
- title: Explore common FAQs
- title: Docker Scout billing
description: Explore how to buy and manage a Docker Scout subscription.
link: /billing/scout-billing/
icon: query_stats
- title: Billing FAQs
description: Find the answers you need and explore common questions.
link: /billing/faqs/
icon: help
---

Use the resources in this section to manage your billing and payment settings for your Pro, Team, or Business subscription.
Use the resources in this section to manage your billing and payment settings for your Pro, Team, or Business subscription, or for your Docker Scout subscription.

{{< grid >}}
20 changes: 17 additions & 3 deletions content/subscription/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,37 @@ description: Learn about subscription features and how to manage your subscripti
keywords: Docker, pricing, billing, Pro, Team, business, subscription, tier, plan
title: Docker subscription overview
grid:
- title: Understand Docker subscriptions and features
- title: Docker subscriptions and features
description: Explore what you can do with your Docker subscription.
link: /subscription/details/
icon: feature_search
- title: Upgrade your subscription
description: Learn how to upgrade your plan to the next level.
link: /subscription/upgrade/
icon: upgrade
- title: Add more seats to your subscription
description: Do more with Docker and add seats to your subscription.
link: /subscription/add-seats/
icon: group_add
- title: Explore common FAQs
- title: Subscription FAQs
description: Find the answers you need and explore common questions.
link: /subscription/faq/
icon: help
- title: Docker Scout subscriptions and features
description: Discover how a Docker Scout subscription can help you create a more secure supply chain.
link: /subscription/scout-details/
icon: query_stats
- title: Docker Desktop license agreement
description: Review the terms of the Docker Subscription Service Agreement.
link: /subscription/desktop-license/
icon: license
aliases:
- /docker-hub/billing/
- /docker-hub/billing/faq/
---

Use the resources in this section to manage your Docker subscription.
A Docker subscription includes licensing for commercial use of Docker components including Docker Desktop and Docker Hub.

Use the resources here to decide what subscription you need, manage an existing subscription, or explore additional products like Docker Scout.

{{< grid >}}
10 changes: 5 additions & 5 deletions content/subscription/details.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ This page provides an overview of each tier. To compare features available in ea

## Docker Personal

Docker Personal (formerly Docker Free) is ideal for open-source communities, individual developers, education, and small businesses. Docker Personal allows free use of Docker components including the Docker CLI, Docker Compose, Docker Engine, Docker Desktop, Docker Hub, Kubernetes, Docker Build and Docker BuildKit, Docker Official Images, and more.

Docker Personal (formerly Docker Free) is ideal for open-source communities, individual developers, education, and small businesses, and includes the free use of Docker components including Docker Desktop and Docker Hub.
Docker Personal includes:

- Unlimited public repositories
- Unlimited [Scoped Access Tokens](../security/for-developers/access-tokens.md)
- Unlimited [collaborators](../docker-hub/repos/access.md#collaborators-and-their-role) for public repositories at no cost per month.
- Access to [Docker Scout Free](./scout-details.md#docker-scout-free) to get started with software supply chain security.

Additionally, anonymous users get 100 pulls every 6 hours and users that sign in to Docker get 200 pulls every 6 hours.
Additionally, anonymous users get 100 pulls every 6 hours and users that sign in to Docker get 200 pulls every 6 hours.

For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/).

Expand All @@ -35,7 +35,7 @@ For a list of features available in each tier, see [Docker Pricing](https://www.

## Docker Team

**Docker Team** offers capabilities for collaboration, productivity, and security across organizations. It enables groups of developers to unlock the full power of collaboration and sharing combined with essential security features and team management capabilities.
**Docker Team** offers capabilities for collaboration, productivity, and security across organizations. It enables groups of developers to unlock the full power of collaboration and sharing combined with essential security features and team management capabilities. A Docker Team subscription includes licensing for commercial use of Docker components including Docker Desktop and Docker Hub.

Docker Team includes:
- Everything included in Docker Pro
Expand All @@ -50,7 +50,7 @@ For a list of features available in each tier, see [Docker Pricing](https://www.

## Docker Business

**Docker Business** offers centralized management and advanced security features for enterprises that use Docker at scale. It empowers leaders to manage their Docker development environments and speed up their secure software supply chain initiatives.
**Docker Business** offers centralized management and advanced security features for enterprises that use Docker at scale. It empowers leaders to manage their Docker development environments and speed up their secure software supply chain initiatives. A Docker Business subscription includes licensing for commercial use of Docker components including Docker Desktop and Docker Hub.

Docker Business includes:
- Everything included in Docker Team
Expand Down
6 changes: 5 additions & 1 deletion content/subscription/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Personal subscriptions do not include collaborators for private repositories. If

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.

### Can I pause or delay my Docker Hub subscription?
### Can I pause or delay my Docker subscription?

You can't pause or delay a subscription. If a subscription invoice hasn't been paid on the due date, there's a 15 day grace period, including the due date.

Expand All @@ -49,3 +49,7 @@ Subscriptions are non-transferable.
### I have more questions regarding the new pricing, who can I reach out to?

If you have any questions that are not covered in the FAQ, [please reach out](https://www.docker.com/company/contact) and a member of the Docker team will get back to you.

### Is Docker Scout included with my Docker Subscription?

If you have a Docker subscription, you automatically have access to a Docker Scout Free subscription. This lets you enable Docker Scout on up to 3 repositories. To enable Docker Scout for additional repositories, you can [upgrade your plan](../billing/scout-billing.md).
4 changes: 2 additions & 2 deletions content/subscription/scout-details.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ keywords: subscription, free, team, business, features

This page provides an overview of the subscription plans for Docker Scout. To compare features available for each plan, see [Docker Scout Pricing](https://docker.com/products/docker-scout).

## Docker Scout Free
## Docker Scout Free

Docker Scout Free is available for both personal accounts and organizations. This plan is ideal for individual developers getting started with software supply chain security.
Docker Scout Free is available for both personal accounts and organizations. If you have a Docker subscription, you automatically have access to Docker Scout Free. This plan is ideal for individual developers getting started with software supply chain security.

Docker Scout Free includes:

Expand Down

0 comments on commit c47c4a4

Please sign in to comment.