docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

First draft for subscription changes 

Signed-off-by: Usha Mandya <usha.mandya@docker.com>
This commit is contained in:
Usha Mandya 2021-08-24 15:21:03 +00:00
parent 6332424085
commit e8e7f7f05d
23 changed files with 196 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
_data/toc.yaml
View File

@ -1402,20 +1402,20 @@ manuals:
title: Docker Verified Publisher Program
- path: /docker-hub/release-notes/
title: Release notes
- sectiontitle: Docker subscription
section:
- path: /subscription/
title: Overview
- path: /subscription/upgrade/
title: Upgrade your plan
title: Upgrade
- path: /subscription/downgrade/
title: Downgrade your plan
title: Downgrade
- path: /subscription/add-seats/
title: Add seats
- path: /subscription/remove-seats/
title: Remove seats
- path: /subscription/faq/
title: Pricing FAQs
- sectiontitle: Open-source projects
section:
- sectiontitle: Docker Registry

17
_includes/desktop-update.md
View File

@ -1,9 +1,22 @@
<!-- This text will be included in the Mac and Windows Install topic -->
Starting with Docker Desktop 3.0.0, updates to Docker Desktop will be available as delta updates from the previous version. When an update is available, Docker Desktop displays an icon to indicate the availability of a newer version. You can choose when to start the download and installation process.
When an update is available, Docker Desktop displays an icon to indicate the availability of a newer version. You can choose when to start the download and installation process.
> To encourage developers to stay up to date, Docker Desktop displays a reminder two weeks after an update becomes available. You can dismiss this daily reminder by clicking **Snooze**. You can skip an update when a reminder appears by clicking the **Skip this update** option.
To encourage developers to stay up to date, Docker Desktop displays a reminder two weeks after an update becomes available. You can dismiss this daily reminder by clicking **Snooze**. You can skip an update when a reminder appears by clicking the **Skip this update** option.
> **Docker Subscription Service Terms**
>
> Beginning on August 31, 2021, you must agree to the [Docker Subscription Service Terms](https://www.docker.com/legal/docker-terms-service){: target="_blank" rel="noopener" class="_"} to continue using Docker Desktop. Read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} and the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"} to learn more about the changes.
![Snooze update](/desktop/mac/images/snooze-update.png){:width="500px"}
Click **Download update** When you are ready to download the update. This downloads the update in the background. After downloading the update, click **Update and restart** from the Docker menu. This installs the latest update and restarts Docker Desktop for the changes to take effect.
When Docker Desktop starts, it displays the Subscription Service Terms window. Read the information presented on the screen to understand how the changes impact you. Click the checkbox to indicate that you accept the terms of service and then click **Accept** to continue.
> **Important**
>
> If you do not agree to the terms, the Docker Desktop application will close and you can no longer run Docker Desktop on your machine.You can choose to accept the terms at a later date by opening Docker Desktop.
{: .important}
Docker Desktop starts after you accept the terms of service.

6
_includes/eula.md
View File

@ -1,2 +1,6 @@
<!-- This text will be included in topics containing Docker Desktop download URLs -->
By downloading Docker Desktop, you agree to the terms of the [Docker Software End User License Agreement](https://www.docker.com/legal/docker-software-end-user-license-agreement){: target="_blank" rel="noopener" class="_"} and the [Docker Data Processing Agreement](https://www.docker.com/legal/data-processing-agreement){: target="_blank" rel="noopener" class="_"}.
> **Important**
>
> By downloading Docker Desktop, you agree to the [Docker Subscription Service Terms](https://www.docker.com/legal/docker-terms-service){: target="_blank" rel="noopener" class="_"}, [Docker Data Processing Agreement](https://www.docker.com/legal/data-processing-agreement){: target="_blank" rel="noopener" class="_"}, and the [Docker Privacy Policy](https://www.docker.com/legal/docker-privacy-policy){: target="_blank" rel="noopener" class="_"}.
{: .important}

8
_includes/landing-page/docker-pricing.html
View File

@ -3,15 +3,15 @@
<div class="row">
<div class="col-xs-12 col-md-6 col-lg-offset-1 col-lg-7">
<h2>
New Pricing and Packaging announced!
Docker updates subscription model to deliver scale, speed, and security
</h2>
<h5>
We've created new plans that provide enhanced privacy and security, parallel automated builds, user management, and more for developers and development teams.
The updated Docker subscription tiers deliver the productivity and collaboration developers rely on, paired with the security and trust businesses demand. Docker subscription tiers now include Personal, Pro, Team, and Buisness.
</h5>
</div>
<div class="col-xs-12 col-md-6 col-lg-4 text-center">
<a class="btn" href="https://www.docker.com/pricing" target="_blank" rel="noopener">
Check out the details
<a class="btn" href="https://docs.docker.com/subscription/" target="_blank" rel="noopener">
Learn more
</a>
</div>
</div>

2
_includes/upgrade-cta.html
View File

@ -4,6 +4,6 @@
{{ include.body | markdownify }}
<a class="btn btn-primary" role="button" href="{{include.target-url}}" target="_blank">
Upgrade my plan
Upgrade now
</a>
</div>

2
_layouts/landing.html
View File

@ -143,7 +143,7 @@
</div>
</section>
{% include landing-page/dev-environments.html %}
{% include landing-page/docker-pricing.html %}
<section class="container help-by-product">
<div class="row">

6
desktop/dashboard.md
View File

@ -208,7 +208,7 @@ The Images view also allows you to manage and interact with images in remote rep
> **Note**
>
> If you have subscribed to a Pro or a Team plan and enabled [Vulnerability Scanning](../docker-hub/vulnerability-scanning.md) in Docker Hub, the scan results will appear on the Remote repositories tab.
> If you have a paid Docker subscription and enabled [Vulnerability Scanning](../docker-hub/vulnerability-scanning.md) in Docker Hub, the scan results will appear on the Remote repositories tab.
The **Pull** option allows you to pull the latest version of the image from Docker Hub. The **View in Hub** option opens the Docker Hub page and displays detailed information about the image, such as the OS architecture, size of the image, the date when the image was pushed, and a list of the image layers.
@ -232,8 +232,8 @@ You can use [volumes](../storage/volumes.md) to store files and share them among
The **Volumes** view in Docker Dashboard enables you to easily create and delete volumes and see which ones are being used. If you are a developer subscribed to a Pro or a Team plan, you can also see which container is using a specific volume and explore the files and folders in your volumes.
{% include upgrade-cta.html
body="To start exploring the details in your volumes, upgrade to a Pro or a Team plan."
header-text="This feature requires a Pro or a Team plan"
body="To start exploring the details in your volumes, upgrade to a Docker Pro, Team, or a Business subscription."
header-text="This feature requires a paid Docker subscription"
target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_volumes"
%}

8
desktop/dev-environments.md
View File

@ -88,7 +88,13 @@ Let's summarize the tasks we performed so far to start a single container Dev En
## Share your Dev Environment
If you are a member of the Docker [Team plan](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"}, you can now share you Dev Environment with your team. When you are ready to share your environment, just click the **Share** button and specify the Docker Hub namespace where you'd like to push your Dev Environment to.
{% include upgrade-cta.html
body="Docker Pro, Team, and Business users can now share Dev Environments with their team members."
header-text="This feature requires a paid Docker subscription"
target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade"
%}
When you are ready to share your environment, just click the **Share** button and specify the Docker Hub namespace where you’d like to push your Dev Environment to.
![Share a Dev environment](images/dev-env-share.png){:width="700px"}

10
desktop/faqs.md
View File

@ -15,6 +15,16 @@ toc_max: 2
For information about Docker Desktop system requirements, see [Docker Desktop for Mac system requirements](mac/install.md#system-requirements) and [Docker Desktop for Windows system requirements](windows/install.md#system-requirements).
### Do I need to pay to use Docker Desktop?
Docker Desktop remains free for small businesses (fewer than 250 employees AND less than $1 million in revenue), personal use, education, and non-commercial open source projects. It requires a paid subscription for professional use in larger enterprises.
The effective date of these terms is 31 August 2021. There is a grace period until 31 January 2022 for those that will require a paid subscription to use Docker Desktop.
When downloading and installing Docker Desktop, you will be asked to agree to the [Docker Subscription Service Terms](https://www.docker.com/legal/docker-terms-service){: target="_blank" rel="noopener" class="_"}.
[Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}.
### What is an experimental feature?
{% include experimental.md %}

BIN
desktop/mac/images/snooze-update.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 36 KiB

BIN
desktop/mac/images/subscription-terms.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 141 KiB

48
desktop/mac/install.md
View File

@ -6,14 +6,15 @@ redirect_from:
- /docker-for-mac/install/
---
Welcome to Docker Desktop for Mac. This page contains information about Docker Desktop for Mac system requirements, download URLs, installation instructions, and automatic updates.
Welcome to Docker Desktop for Mac. This page contains information about Docker Desktop for Mac system requirements, download URLs, instructions to install and update Docker Desktop for Mac.
{% include eula.md %}
Download Docker Desktop for Mac:
[Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn}
[Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn}
{% include eula.md %}
## System requirements
@ -69,27 +70,46 @@ The Docker Desktop installation includes
![Install Docker app](images/docker-app-drag.png)
2. Double-click `Docker.app` in the Applications folder to start Docker. (In the example below, the Applications folder is in "grid" view mode.)
2. Double-click `Docker.app` in the Applications folder to start Docker.In the example below, the Applications folder is in "grid" view mode.
![Docker app in Hockeyapp](images/docker-app-in-apps.png)
The Docker menu in the top status bar indicates that Docker Desktop is running, and accessible from a terminal.
3. The Docker menu (![whale menu](images/whale-x.png){: .inline}) displays the Subscription Service Terms window. It includes a change to the terms of use for Docker Desktop.
![Whale in menu bar](images/whale-in-menu-bar.png)
> **Docker Subscription Service Terms**
>
> Beginning on August 31, 2021, you must agree to the [Docker Subscription Service Terms](https://www.docker.com/legal/docker-terms-service){: target="_blank" rel="noopener" class="_"} to continue using Docker Desktop. Read the information presented on the screen to understand how the changes impact you.
If you've just installed the app, Docker Desktop launches the onboarding tutorial. The tutorial includes a simple exercise to build an example Docker image, run it as a container, push and save the image to Docker Hub.
![Subscription service terms](images/subscription-terms.png){:width="700px"}
![Docker Quick Start tutorial](images/docker-tutorial-mac.png)
**Here’s a summary of the key changes:**
3. Click the Docker menu (![whale menu](images/whale-x.png){: .inline}) to see
**Preferences** and other options.
- Docker Subscription Service Terms include a change to the terms of use for Docker Desktop
- It remains free for small businesses (fewer than 250 employees AND less than $1 million in revenue), personal use, education, and non-commercial open source projects.
- It requires a paid subscription for professional use in larger enterprises.
- The effective date of these terms is 31 August 2021. There is a grace period until 31 January 2022 for those that will require a paid subscription to use Docker Desktop.
- The existing Docker Free subscription has been renamed Docker Personal and we have introduced a Docker Business subscription .
The Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop.
4. Select **About Docker** to verify that you have the latest version.
The [blog post](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} and the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"} also give you detailed information about the changes.
Congratulations! You are now successfully running Docker Desktop.
4. Click the checkbox to indicate that you accept the terms of service and then click **Accept** to continue. Docker Desktop starts after you accept the terms of service.
If you would like to rerun the tutorial, go to the Docker Desktop menu
and select **Learn**.
> **Important**
>
> If you do not agree to the terms of service, the Docker Desktop application will close and you can no longer run Docker Desktop on your machine. You can choose to accept the terms at a later date by opening Docker Desktop.
{: .important}
For more information, see [Docker Desktop license terms](/subscription/#docker-desktop-license-terms).
### Quick start guide
If you've just installed the app, Docker Desktop launches the Quick Start Guide. The tutorial includes a simple exercise to build an example Docker image, run it is a container, push and save the image to Docker Hub.
![Docker Quick Start tutorial](images/docker-tutorial-mac.png)
Congratulations! You are now successfully running Docker Desktop. Click the Docker menu (![whale menu](images/whale-x.png){: .inline}) to see
**Preferences** and other options. To run the Quick Start Guide on demand, select the Docker menu and then choose **Quick Start Guide**.
## Updates
@ -102,7 +122,7 @@ To uninstall Docker Desktop from your Mac:
1. From the Docker menu, select **Troubleshoot** and then select **Uninstall**.
2. Click **Uninstall** to confirm your selection.
> **Important**
> **Note**
>
> Uninstalling Docker Desktop destroys Docker containers, images, volumes, and
> other Docker related data local to the machine, and removes the files generated

6
desktop/mac/troubleshoot.md
View File

@ -9,7 +9,7 @@ toc_max: 2
---
{% include upgrade-cta.html
body="Did you know that Docker Desktop now offers support for developers subscribed to a Pro or a Team plan? Upgrade your existing plan to benefit from Docker Support. Click [here](#support) to learn more."
body="Did you know that Docker Desktop offers support for developers on a paid Docker subscription (Pro, Team, or Business)? Upgrade now to benefit from Docker Support. Click [here](#support) to learn more."
target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_desktop_support"
%}
@ -359,8 +359,8 @@ in the Apple documentation, and Docker Desktop [Mac system requirements](install
This section contains instructions on how to get support, and covers the scope of Docker Desktop support.
{% include upgrade-cta.html
body="Docker Desktop offers support for developers subscribed to a Pro or a Team plan. Upgrade your existing plan to benefit from Docker Support."
header-text="This feature requires a Pro or a Team plan"
body="Docker Desktop offers support for developers subscribed to a Pro, Team, or a Business tier. Upgrade now to benefit from Docker Support."
header-text="This feature requires a paid Docker subscription"
target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_desktop_support"
%}

38
desktop/windows/install.md
View File

@ -12,13 +12,13 @@ redirect_from:
- /install/windows/ee-preview/
---
Welcome to Docker Desktop for Windows. This page contains information about Docker Desktop for Windows system requirements, download URL, installation instructions, and automatic updates.
Welcome to Docker Desktop for Windows. This page contains information about Docker Desktop for Windows system requirements, download URL, instructions to install and update Docker Desktop for Windows.
{% include eula.md %}
[Docker Desktop for Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe){:
.button .primary-btn}
{% include eula.md %}
## System requirements
Your Windows machine must meet the following requirements to successfully install Docker Desktop.
@ -122,14 +122,36 @@ Docker Desktop does not start automatically after installation. To start Docker
![search for Docker app](images/docker-app-search.png){:width="300px"}
When the whale icon in the status bar stays steady, Docker Desktop is up-and-running, and is accessible from any terminal window.
![whale on taskbar](images/whale-icon-systray.png)
The Docker menu (![whale menu](images/whale-x.png){: .inline}) displays the Subscription Service Terms window. It includes a change to the terms of use for Docker Desktop.
If the whale icon is hidden in the Notifications area, click the up arrow on the
taskbar to show it. To learn more, see [Docker Settings](index.md#settings).
> **Docker Subscription Service Terms**
>
> Beginning on August 31, 2021, you must agree to the [Docker Subscription Service Terms](https://www.docker.com/legal/docker-terms-service){: target="_blank" rel="noopener" class="_"} to continue using Docker Desktop. Read the information presented on the screen to understand how the changes impact you.
## Quick Start Guide
![Subscription service terms](../mac/images/subscription-terms.png){:width="700px"}
**Here’s a summary of the key changes:**
- Docker Subscription Service Terms include a change to the terms of use for Docker Desktop
- It remains free for small businesses (fewer than 250 employees AND less than $1 million in revenue), personal use, education, and non-commercial open source projects.
- It requires a paid subscription for professional use in larger enterprises.
- The effective date of these terms is 31 August 2021. There is a grace period until 31 January 2022 for those that will require a paid subscription to use Docker Desktop.
- The existing Docker Free subscription has been renamed Docker Personal and we have introduced a Docker Business subscription .
The Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop.
The [blog post](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} and the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}also give you detailed information about the changes.
Click the checkbox to indicate that you accept the terms of service and then click **Accept** to continue. Docker Desktop starts after you accept the terms of service.
> **Important**
>
> If you do not agree to the terms of service, the Docker Desktop application will close and you can no longer run Docker Desktop on your machine. You can choose to accept the terms at a later date by opening Docker Desktop.
{: .important}
For more information, see [Docker Desktop license terms](/subscription/#docker-desktop-license-terms).
### Quick Start Guide
When the initialization is complete, Docker Desktop launches the **Quick Start Guide**. This tutorial includes a simple exercise to build an example Docker image, run it as a container, push and save the image to Docker Hub.

6
desktop/windows/troubleshoot.md
View File

@ -10,7 +10,7 @@ toc_max: 2
---
{% include upgrade-cta.html
body="Did you know that Docker Desktop now offers support for developers subscribed to a Pro or a Team plan? Upgrade your existing plan to benefit from Docker Support. Click [here](#support) to learn more."
body="Did you know that Docker Desktop offers support for developers on a paid Docker subscription (Pro, Team, or Business)? Upgrade now to benefit from Docker Support. Click [here](#support) to learn more."
target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_desktop_support"
%}
@ -442,8 +442,8 @@ explore other workarounds suggested on Docker Desktop forums.
This section contains instructions on how to get support, and covers the scope of Docker Desktop support.
{% include upgrade-cta.html
body="Docker Desktop offers support for developers subscribed to a Pro or a Team plan. Upgrade your existing plan to benefit from Docker Support."
header-text="This feature requires a Pro or a Team plan"
body="Docker Desktop offers support for developers subscribed to a Pro, Team, or a Business tier. Upgrade now to benefit from Docker Support."
header-text="This feature requires a paid Docker subscription"
target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_desktop_support"
%}

4
docker-hub/audit-log.md
View File

@ -5,8 +5,8 @@ title: Audit log
---
{% include upgrade-cta.html
body="The Audit log feature is available for organizations subscribed to a Team plan. Upgrade your existing plan to start tracking events across your organization."
header-text="This feature requires a Team plan"
body="The Audit log feature is available for users subscribed to a Docker Team or a Business subscription. Upgrade now to start tracking events across your organization."
header-text="This feature requires a paid Docker subscription"
target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_audit_log"
%}

4
docker-hub/builds/index.md
View File

@ -11,8 +11,8 @@ title: Set up Automated Builds
---
{% include upgrade-cta.html
body="The Automated Builds feature is available on Pro and Team plans. Upgrade your existing plan to start automatically building and pushing your images today."
header-text="This feature requires a Pro or a Team plan"
body="The Automated Builds feature is available for Docker Pro, Team, and Business users. Upgrade now to automatically build and push your images."
header-text="This feature requires a Docker subscription"
target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_auto_builds"
%}

4
docker-hub/image-management.md
View File

@ -5,8 +5,8 @@ title: Advanced Image Management dashboard
---
{% include upgrade-cta.html
body="Docker Pro and Team users can now use Docker Hub's new **Advanced Image Management** dashboard. The dashboard enables a new level of access to your content, allowing fine-grained pruning of old data and exploration of old versions of pushed images. Upgrade your existing plan to start using the Advanced Image Management dashboard."
header-text="This feature requires a Pro or a Team plan"
body="Docker Pro, Team, and Business users can now use Docker Hub's **Advanced Image Management** dashboard. The dashboard enables a new level of access to your content, allowing fine-grained pruning of old data and exploration of old versions of pushed images. Upgrade now to start using the Advanced Image Management dashboard."
header-text="This feature requires a paid Docker subscription"
target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_image-mgmt"
%}

4
docker-hub/vulnerability-scanning.md
View File

@ -5,8 +5,8 @@ title: Hub Vulnerability Scanning
---
{% include upgrade-cta.html
body="Docker Hub Vulnerability Scanning is available for developers subscribed to a Pro or a Team plan. Upgrade your existing plan to get automatic vulnerability scans for your images."
header-text="This feature requires a Pro or a Team plan"
body="Docker Hub Vulnerability Scanning is available for users subscribed to Docker Pro, Team, or a Business subscription. Upgrade now to get automatic vulnerability scans for your images."
header-text="This feature requires a paid Docker subscription"
target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_scan"
%}

4
get-docker.md
View File

@ -19,6 +19,8 @@ significantly reduce the delay between writing code and running it in production
You can download and install Docker on multiple platforms. Refer to the following
section and choose the best installation path for you.
{% include eula.md %}
<div class="component-container">
<!--start row-->
<div class="row">
@ -51,5 +53,3 @@ section and choose the best installation path for you.
</div>
</div>
</div>
{% include eula.md %}

4
subscription/downgrade.md
View File

@ -1,7 +1,7 @@
---
description: Downgrade your Docker Hub Plan
description: Downgrade your Docker subscription
keywords: Docker Hub, downgrade, subscription, Pro, Team, Free, pricing plan,
title: Downgrade your plan
title: Downgrade your subscription
redirect_from:
- /docker-hub/cancel-downgrade/
- /docker-hub/billing/downgrade/

77
subscription/index.md
View File

@ -1,36 +1,83 @@
---
description: Docker subscription overview
keywords: Docker, pricing, billing, Pro, Team, subscription, plans,
keywords: Docker, pricing, billing, Pro, Team, subscription, tier, plan
title: Docker subscription overview
redirect_from:
- /docker-hub/billing/
- /docker-hub/billing/faq/
- /subscription/faq/
---
On May 14, 2020, Docker announced a new, per-seat pricing model that aligns with Docker’s [product strategy](https://www.docker.com/blog/docker-strategy-helping-devs-build-and-ship-faster/){: target="_blank" rel="noopener" class="_"} to accelerate developer workflows for cloud-native development. The previous private repository/parallel autobuild-based plans have been replaced with new **Pro** and **Team** subscriptions that include unlimited private repositories and up to 50,000 container pulls in a 24-hour period.
Starting with May 14, 2020, new customers who sign up for Docker can choose between the new Free, Pro, and Team plans.
On August 31, 2021, we [announced](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} updates and extensions to our product subscriptions to increase productivity, collaboration, and added security for our developers. Docker subscription tiers now include Personal, Pro, Team, and Business.
Existing Docker customers who had subscribed to a paid plan before May 14, 2020 have been converted to the new Pro or Team plan after January 31, 2021.
Here's a summary of the changes:
## Pricing plans
- We’re introducing a new product subscription, Docker Business, for large enterprises that require features like registry restrictions, SSO, secure software supply chain management, and more.
- Our Docker Subscription Service Terms include a change to the terms of use for Docker Desktop.
- It remains free for small businesses (fewer than 250 employees AND less than $1 million in annual revenue), personal use, education, and non-commercial open source projects.
- It requires a paid subscription (Pro, Team, or Business), for as little as $5 a month, for professional use in larger enterprises.
- The effective date of these terms is 31 August 2021. There is a grace period until 31 January 2022 for those that will require a paid subscription to use Docker Desktop.
- The Docker Pro and Docker Team subscriptions now include commercial use of Docker Desktop.
- The existing Docker Free subscription has been renamed Docker Personal.
- No changes to Docker Engine or any other upstream open source Docker or Moby project.
Docker offers pricing plans that are tailored for individual developers and development teams. You can also choose between an **Annual** or a **Monthly** subscription. The Pro and Team plans offered through annual subscription include a discount compared to the price of the same plan offered through monthly subscription.
To understand how these changes affect you, read the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}.
**For individuals:**
To compare features available in each subscription, see the [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_"} page.
The **Pro** plan includes unlimited public repositories, unlimited private repositories, unlimited [collaborators](../docker-hub/repos.md#collaborators-and-their-role) for public repositories, one [service account](../docker-hub/service-accounts.md) for private repositories, autobuilds with 5 parallel builds, starting at $5 per month with the annual subscription.
## Docker Personal
Docker Personal is the new name for the Docker Free subscription. With its focus on the open source communities, individual developers, education, and small businesses, Docker Personal will continue to allow 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, Docker Scan, and more.
Docker Personal includes unlimited public repositories and unlimited collaborators for public repositories and zero service accounts for private repositories at no cost per month.
For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_"}.
## Docker Pro
**Docker Pro** enables individual developers to get more control of their development environment and provides an integrated and reliable developer experience. It includes unlimited public repositories, unlimited private repositories, unlimited [collaborators](../docker-hub/repos.md#collaborators-and-their-role) for public repositories, one [service account](../docker-hub/service-accounts.md) for private repositories, autobuilds with 5 parallel builds, starting at $5 per month with the annual subscription.
> **Note**
>
> Pro plans allow one service account for private repositories. For more information, see [service accounts](../docker-hub/service-accounts.md). If you already have more than one collaborator in your private repository, you’ll not be able to add any further collaborators. Any new private repository that you create will be restricted to one service account.
> Docker Pro tiers allow one service account for private repositories. For more information, see [service accounts](../docker-hub/service-accounts.md). If you already have more than one collaborator in your private repository, you’ll not be able to add any further collaborators. Any new private repository that you create will be restricted to one service account.
The **Free** plan includes unlimited public repositories and unlimited collaborators for public repositories and zero service accounts for private repositories at no cost per month.
For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_"}.
**For development teams:**
## Docker Team
The **Team** plan includes unlimited public and unlimited private repositories starting at $25 per month for the first 5 users and $7 per month for each user thereafter with the annual subscription. In addition, the Team plan offers autobuilds with 15 parallel builds, advanced collaboration and management tools, including organization and team management with role-based access controls for the whole team.
The **Docker Team** tier includes unlimited public and unlimited private repositories starting at $25 per month for the first 5 users and $7 per month for each user thereafter with the annual subscription. In addition, the Team tier offers autobuilds with 15 parallel builds, advanced collaboration and management tools, including organization and team management with role-based access controls for the whole team.
The **Free Team** plan includes unlimited public repositories at no cost per month. This plan also offers advanced collaboration and management tools, including organization and team management with role-based access controls which are limited to 1 team and 3 team members.
For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_"}.
For information on how to purchase a plan, see [Upgrade your plan](../subscription/upgrade.md), or to learn more about the features available in each plan, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}.
## Docker Business
For frequently asked questions about pricing, see [Docker pricing FAQ](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}.
The new Docker Business subscription enables organization-wide management and security for businesses that use Docker at scale. With an easy-to-use SaaS-based management plane, IT leaders can now efficiently monitor and manage all their Docker environments and accelerate their secure software supply chain initiatives.
In addition to all the capabilities available in the Pro and Team tiers, Docker Business tier adds the ability to control what registries and content developers can access, ensuring teams are building secure from the start by only pulling trusted base images.
For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_"}.
## Docker Desktop license terms
Docker Desktop is licensed under the [Docker Subscription Service Terms](https://www.docker.com/legal/docker-terms-service){: target="_blank" rel="noopener" class="_"}. When downloading and installing Docker Desktop, you will be asked to agree to the terms of service.
![Subscription service terms](../desktop/mac/images/subscription-terms.png){:width="700px"}
Here's a summary of the key changes:
- Docker Desktop remains free for small businesses (fewer than 250 employees AND less than $1 million in revenue), personal use, education, and non-commercial open source projects.
- It requires a paid subscription for professional use in larger enterprises.
The effective date of these terms is 31 August 2021. There is a grace period until 31 January 2022 for those that will require a paid subscription to use Docker Desktop.
- The Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop
You can also find a copy of the Docker Subscription Service Terms from the Docker menu. Select ![whale menu](../desktop/mac/images/whale-x.png){: .inline} > **About Docker Desktop** > **Subscription Service Terms**.
Docker Desktop is built using open source software. For information about the licensing of open source components in Docker Desktop, Select ![whale menu](../desktop/mac/images/whale-x.png){: .inline} > **About Docker Desktop** > **Acknowledgements**.
> **Note**
>
> The licensing and distribution terms for Docker and Moby open source projects such as Docker Engine are not changing.
For information on how to subscribe, see [Upgrade your subscription](../subscription/upgrade.md), or to learn more about the features available in each tier, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}.
For frequently asked questions about pricing, see [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}.

4
subscription/upgrade.md
View File

@ -1,7 +1,7 @@
---
description: Upgrading your Docker Hub Plan
description: Upgrading your Docker subscription
keywords: Docker Hub, upgrade, subscription, Pro, Team, pricing plan,
title: Upgrade your plan
title: Upgrade your subscription
redirect_from:
- /docker-hub/upgrade/
- /docker-hub/billing/upgrade/