diff --git a/_config.yml b/_config.yml index 475084a166..b84fc4af19 100644 --- a/_config.yml +++ b/_config.yml @@ -28,6 +28,20 @@ compose_file_v2: "2.4" machine_version: "0.16.0" distribution_version: "2.7" +# URLs for license and conditions +# TODO move these inline once these are stable / final +# TODO add final link to DSST +dsst_url: "https://www.docker.com/legal/docker-subscription-service-agreement" # Docker Subscription Service Agreement + +# Link to Docker Subscription Service Agreement announcement blog-post +dsst_announcement_url: "https://www.docker.com/blog/updating-product-subscriptions/" + +# Link to Docker Subscription Service Agreement FAQs +dsst_faqs_url: "https://www.docker.com/pricing/faq" + +# Link to Docker Terms of Service +tos_url: "https://www.docker.com/legal/docker-terms-service" + # List of plugins to enable for local development builds. Mostly the same as # for production, but without the "jekyll-sitemap" plugin, which is not needed # for previewing, and excluding saves some time to build diff --git a/_data/toc.yaml b/_data/toc.yaml index 27cadfd8c6..8441b80b16 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -1230,8 +1230,6 @@ manuals: title: FAQs - path: /desktop/backup-and-restore/ title: Back up and restore data - - path: /desktop/opensource/ - title: Open source licensing - sectiontitle: Docker Engine section: @@ -1370,6 +1368,8 @@ manuals: title: Slack integration - path: /docker-hub/orgs/ title: Teams and organizations + - path: /docker-hub/image-access-management/ + title: Image Access Management - path: /docker-hub/vulnerability-scanning/ title: Vulnerability scanning - path: /docker-hub/audit-log/ @@ -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 diff --git a/_includes/desktop-license-update.md b/_includes/desktop-license-update.md new file mode 100644 index 0000000000..4fe2c49af4 --- /dev/null +++ b/_includes/desktop-license-update.md @@ -0,0 +1,16 @@ + + + > **Docker Subscription Service Agreement** + > + > We’ve updated the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_" id="dkr_docs_desktop_install_btl"}. Please read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_desktop_install_btl"} and [FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_" id="dkr_docs_desktop_install_btl"} to learn how companies using Docker Desktop may be affected. + + **Here’s a summary of the key changes:** + + - Our Docker Subscription Service Agreement include a change to the terms of use for Docker Desktop + - It **remains free** for small businesses (fewer than 250 employees AND less than $10 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 August 31, 2021. There is a **grace period** until January 31, 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. + + diff --git a/_includes/desktop-update.md b/_includes/desktop-update.md index 2bd1419002..e3b959055a 100644 --- a/_includes/desktop-update.md +++ b/_includes/desktop-update.md @@ -1,9 +1,20 @@ -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. -![Snooze update](/desktop/mac/images/snooze-update.png){:width="500px"} +> **Docker Subscription Service Agreement** +> +> Beginning on August 31, 2021, you must agree to the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: 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. 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 Docker Subscription Service Agreement window. Read the information presented on the screen to understand how the changes impact you. Click the checkbox to indicate that you accept the updated terms 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. diff --git a/_includes/eula-modal.html b/_includes/eula-modal.html new file mode 100644 index 0000000000..7eb058078e --- /dev/null +++ b/_includes/eula-modal.html @@ -0,0 +1,30 @@ + diff --git a/_includes/eula.md b/_includes/eula.md index 5981a72f49..da12ef84f4 100644 --- a/_includes/eula.md +++ b/_includes/eula.md @@ -1,2 +1,8 @@ -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="_"}. +We've updated the [Docker Subscription Service Agreement]({{ site.dsst_url }}){: target="_blank" rel="noopener" class="_" id="dkr_docs_relnotes_btl"}. +Please [read the announcement]({{ site.dsst_announcement_url }}){: target="_blank" rel="noopener" class="_" id="dkr_docs_relnotes_btl"} +and [FAQs]({{ site.dsst_faqs_url }}){: target="_blank" rel="noopener" class="_" id="dkr_docs_relnotes_btl"} +to learn how companies using Docker Desktop may be affected. +By downloading Docker Desktop, you agree to these updated [terms]({{ site.dsst_url }}){: target="_blank" rel="noopener" class="_"}, +the [Docker Data Processing Agreement](https://www.docker.com/legal/data-processing-agreement){: target="_blank" rel="noopener" class="_" id="dkr_docs_relnotes_btl"}, +and the [Data Privacy Policy](https://www.docker.com/legal/docker-privacy-policy){: target="_blank" rel="noopener" class="_" id="dkr_docs_relnotes_btl"}. diff --git a/_includes/head.html b/_includes/head.html index 09a21c9d1d..d2c1caa90a 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -48,6 +48,10 @@ + + + + {%- comment -%} We put these scripts in the head section, but use "defer" loading to allow the browser to start loading them as soon as possible. Actual execution of deferred diff --git a/_includes/landing-page/docker-pricing.html b/_includes/landing-page/docker-pricing.html index 8c87353eba..fef8c4d214 100644 --- a/_includes/landing-page/docker-pricing.html +++ b/_includes/landing-page/docker-pricing.html @@ -3,15 +3,15 @@

- New Pricing and Packaging announced! + Docker updates subscription model to deliver scale, speed, and security

- 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.
- - Check out the details + + Learn more
diff --git a/_includes/upgrade-cta.html b/_includes/upgrade-cta.html index 02bf4700e7..9b5fdf8ad7 100644 --- a/_includes/upgrade-cta.html +++ b/_includes/upgrade-cta.html @@ -4,6 +4,6 @@ {{ include.body | markdownify }} - Upgrade my plan + Upgrade now diff --git a/_layouts/landing.html b/_layouts/landing.html index 3cc57465ad..d6f0cda8e5 100644 --- a/_layouts/landing.html +++ b/_layouts/landing.html @@ -143,7 +143,7 @@ - {% include landing-page/dev-environments.html %} + {% include landing-page/docker-pricing.html %}
diff --git a/_scss/_buttons.scss b/_scss/_buttons.scss index 35745a885a..760d731793 100755 --- a/_scss/_buttons.scss +++ b/_scss/_buttons.scss @@ -26,7 +26,6 @@ a.button.outline-btn.min-hgt { padding: 12px 35px 10px; min-width: 200px; box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.1); - float: left; text-align: center; white-space: nowrap; &:hover { diff --git a/_scss/_content.scss b/_scss/_content.scss index c8af42d2e9..4f968f7ee7 100755 --- a/_scss/_content.scss +++ b/_scss/_content.scss @@ -107,3 +107,7 @@ a.glossary { opacity: 1; } } + +a.accept-eula { + font-weight: bold; +} diff --git a/_scss/_night-mode.scss b/_scss/_night-mode.scss index df6f915684..af018c2fa3 100755 --- a/_scss/_night-mode.scss +++ b/_scss/_night-mode.scss @@ -198,6 +198,12 @@ body.night { color: #bcbfc3; } + /* modals */ + .modal-content { + background-color: $bg-sidebar-night; + border-left: 4px solid $primary-links; + } + /* tabs */ .nav-tabs { border-bottom: 1px solid #4f6071; diff --git a/_scss/_overrides.scss b/_scss/_overrides.scss index fc84431e63..1cc216fa3b 100755 --- a/_scss/_overrides.scss +++ b/_scss/_overrides.scss @@ -33,10 +33,13 @@ font-weight: bold; } +.btn-primary, .btn-secondary { + padding: 10px 15px 6px; + font-family: $buttons; +} .btn-primary { background-color: $marine-50; border: 1px solid rgba(0, 0, 0, 0.1); - padding: 10px 15px 6px; &:hover { opacity: 0.8; @@ -45,8 +48,6 @@ background-color: $marine-50; border: 1px solid rgba(0, 0, 0, 0.1); } - - font-family: $buttons; } .btn-default:hover { diff --git a/_scss/_utilities.scss b/_scss/_utilities.scss index cc7e6c4440..50a6667cee 100755 --- a/_scss/_utilities.scss +++ b/_scss/_utilities.scss @@ -188,6 +188,25 @@ input[type=text] { } } +.modal-dialog { + .modal-header, .modal-footer { + border: none; + } + .modal-header .close { + display: none; + } + .btn-primary { + background-color: $primary-links; + } + .btn-secondary { + background: transparent; + border-color: $primary-links; + &:hover { + color: inherit; + } + } +} + @media print { .col-nav, .col-toc, diff --git a/ci-cd/best-practices.md b/ci-cd/best-practices.md index d9f3878352..dcab0879ad 100644 --- a/ci-cd/best-practices.md +++ b/ci-cd/best-practices.md @@ -40,6 +40,6 @@ We know there are a lot more tips and tricks for using Docker in CI, however, we > **Note** > - > If you are still experiencing issues with pull limits after you are authenticated, you can consider upgrading to either a [Pro or a Team account](https://www.docker.com/pricing){:target="_blank" rel="noopener" class="_"} . + > If you are still experiencing issues with pull limits after you are authenticated, you can consider upgrading to a [Docker subscription](https://www.docker.com/pricing){:target="_blank" rel="noopener" class="_"}. For information on how to configure GitHub Actions CI/CD pipeline, see [Configure GitHub Actions](github-actions.md). diff --git a/desktop/dashboard.md b/desktop/dashboard.md index cda85b8f4e..7c2b614bc3 100644 --- a/desktop/dashboard.md +++ b/desktop/dashboard.md @@ -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. @@ -223,17 +223,17 @@ To interact with remote repositories: 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. - If you have subscribed to a Pro or a Team plan and have enabled [Vulnerability Scanning](../docker-hub/vulnerability-scanning.md) the Docker Hub page also displays a summary of the vulnerability scan report and provides detailed information about the vulnerabilities identified. + If you have a paid Docker subscription and have enabled [Vulnerability Scanning](../docker-hub/vulnerability-scanning.md) the Docker Hub page also displays a summary of the vulnerability scan report and provides detailed information about the vulnerabilities identified. ## Explore volumes You can use [volumes](../storage/volumes.md) to store files and share them among containers. Volumes are created and are directly managed by Docker. They are also the preferred mechanism to persist data in Docker containers and services. -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. +The **Volumes** view in Docker Dashboard enables you to easily create and delete volumes and see which ones are being used. If you are user with a paid Docker subscription, 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" %} @@ -241,14 +241,14 @@ The following table lists the Volumes UI features available in each plan: {% assign yes = '![yes](/images/green-check.svg){: .inline style="height: 14px; margin: 0 auto"}' %} -| Feature | Free | Pro | Team | -|:----------------------------------------------|:---------:|:---------:|:--------:| -| View, create, and delete volumes | {{ yes }} | {{ yes }} | {{ yes }} | -| See which volumes are in use | {{ yes }} | {{ yes }} | {{ yes }} | -| See the size of the volume | {{ yes }} | {{ yes }} | {{ yes }} | -| See volume data details (modified date, size) | X | {{ yes }} | {{ yes }} | -| See which container is using a volume | X | {{ yes }} | {{ yes }} | -| Save or delete files from a volume | X | {{ yes }} | {{ yes }} | +| Feature | Personal | Pro | Team | Business | +|:----------------------------------------------|:---------:|:---------:|:--------:|:--------:| +| View, create, and delete volumes | {{ yes }} | {{ yes }} | {{ yes }} | {{ yes }} | +| See which volumes are in use | {{ yes }} | {{ yes }} | {{ yes }} | {{ yes }} | +| See the size of the volume | {{ yes }} | {{ yes }} | {{ yes }} | {{ yes }} | +| See volume data details (modified date, size) | X | {{ yes }} | {{ yes }} | {{ yes }} | +| See which container is using a volume | X | {{ yes }} | {{ yes }} | {{ yes }} | +| Save or delete files from a volume | X | {{ yes }} | {{ yes }} | {{ yes }} | ### Manage volumes diff --git a/desktop/dev-environments.md b/desktop/dev-environments.md index a39731f9e1..af06fa357e 100644 --- a/desktop/dev-environments.md +++ b/desktop/dev-environments.md @@ -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"} diff --git a/desktop/faqs.md b/desktop/faqs.md index 82f04a17e3..544c2d7ace 100644 --- a/desktop/faqs.md +++ b/desktop/faqs.md @@ -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 $10 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 August 31, 2021. There is a grace period until January 31, 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 Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: 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 %} @@ -63,7 +73,7 @@ For more information and examples, see ### How do I add custom CA certificates? -Docker Desktop supports all trusted certificate authorities (CAs) (root or intermediate). For more information on adding server and client side certs, see +Docker Desktop supports all trusted certificate authorities (CAs) (root or intermediate). For more information on adding server and client-side certs, see [Add TLS certificates on Mac](mac/index.md#add-tls-certificates) and [Add TLS certificates on Windows](windows/index.md#adding-tls-certificates). ### Can I pass through a USB device to a container? @@ -77,7 +87,7 @@ Docker Desktop can run inside a Windows 10 VM running on apps like Parallels or VMware Fusion on a Mac provided that the VM is properly configured. However, problems and intermittent failures may still occur due to the way these apps virtualize the hardware. For these reasons, **Docker Desktop is not supported in -nested virtualization scenarios**. It might work in some cases, and not in others. +nested virtualization scenarios**. It might work in some cases and not in others. For more information, see [Running Docker Desktop in nested virtualization scenarios](windows/troubleshoot.md#running-docker-desktop-in-nested-virtualization-scenarios). @@ -106,7 +116,7 @@ Each Docker Desktop release is also delivered as a full installer for new users. ### How frequent will new releases be? -New releases will be available roughly monthly, similar to Edge today, unless there are critical fixes that need to be released sooner. +New releases will be available roughly monthly, similar to Edge today unless there are critical fixes that need to be released sooner. ### How do I ensure that all users on my team are using the same version? @@ -124,9 +134,9 @@ Starting with Docker Desktop 3.0.0, Stable and Edge releases are combined into a ### Does Docker Desktop offer support? -Yes, Docker Desktop offers support for Pro and Team users. For more information, see [Docker Desktop Support](mac/troubleshoot.md#support). +Yes, Docker Desktop offers support for users with a paid Docker subscription. For more information, see [Docker Desktop Support](mac/troubleshoot.md#support). -For information about the pricing plans and to upgrade your existing account, see [Docker pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. +For information about Docker subscriptions and to upgrade your existing account, see [Docker pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. ### What kind of feedback are you looking for? @@ -139,7 +149,7 @@ command line integration, and so on. Tell us about the issues you are experienci When uploading diagnostics to help Docker with investigating issues, the uploaded diagnostics bundle may contain personal data such as usernames and IP addresses. The diagnostics bundles are only accessible to Docker, Inc. employees who are directly involved in diagnosing Docker Desktop issues. -By default, Docker, Inc. will delete uploaded diagnostics bundles after 30 days. You may also request the removal of a diagnostics bundle by either specifying the diagnostics ID or via your GitHub ID (if the diagnostics ID is mentioned in a GitHub issue). Docker, Inc. will only use the data in the diagnostics bundle to investigate specific user issues, but may derive high-level (non personal) metrics such as the rate of issues from it. +By default, Docker, Inc. will delete uploaded diagnostics bundles after 30 days. You may also request the removal of a diagnostics bundle by either specifying the diagnostics ID or via your GitHub ID (if the diagnostics ID is mentioned in a GitHub issue). Docker, Inc. will only use the data in the diagnostics bundle to investigate specific user issues but may derive high-level (non personal) metrics such as the rate of issues from it. For more information, see [Docker Data Processing Agreement](https://www.docker.com/legal/data-processing-agreement){: target="_blank" rel="noopener" class="_"}. @@ -162,7 +172,7 @@ VirtualBox or VMWare Fusion. ### What is the benefit of HyperKit? -HyperKit is thinner than VirtualBox and VMWare fusion, and the version we include is customized for Docker workloads on Mac. +HyperKit is thinner than VirtualBox and VMWare fusion, and the version included is customized for Docker workloads on Mac. ### Why is com.docker.vmnetd still running after I quit the app? diff --git a/desktop/index.md b/desktop/index.md index affbdf8c14..e27349fd3c 100644 --- a/desktop/index.md +++ b/desktop/index.md @@ -4,11 +4,13 @@ keywords: Desktop, Docker, GUI, run, docker, local, machine title: Docker Desktop overview toc_min: 1 toc_max: 2 +redirect_from: +- /desktop/opensource/ --- Docker Desktop is an easy-to-install application for your Mac or Windows environment that enables you to build and share containerized applications and microservices. Docker Desktop includes [Docker Engine](../engine/), Docker CLI client, [Docker Compose](../compose/), [Docker Content Trust](../engine/security/trust.md), [Kubernetes](https://github.com/kubernetes/kubernetes/), and [Credential Helper](https://github.com/docker/docker-credential-helpers/). -Docker Desktop works with your choice of development tools and languages and gives you access to a vast library of certified images and templates in [Docker Hub](https://hub.docker.com/). This enables development teams to extend their environment to rapidly auto-build, continuously integrate and collaborate using a secure repository. +Docker Desktop works with your choice of development tools and languages and gives you access to a vast library of certified images and templates in [Docker Hub](https://hub.docker.com/). This enables development teams to extend their environment to rapidly auto-build, continuously integrate, and collaborate using a secure repository. Some of the key features of Docker Desktop include: diff --git a/desktop/mac/apple-silicon.md b/desktop/mac/apple-silicon.md index 0c93731624..974ea6c0a8 100644 --- a/desktop/mac/apple-silicon.md +++ b/desktop/mac/apple-silicon.md @@ -15,9 +15,11 @@ Docker Desktop for Apple silicon also supports multi-platform images, which allo Download Docker Desktop for Mac on Apple silicon: -[Download](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 %} +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [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 .accept-eula }
@@ -73,3 +75,5 @@ We expect to fix this in a future release. Your feedback is important to us. Let us know your feedback by creating an issue in the [Docker Desktop for Mac GitHub](https://github.com/docker/for-mac/issues) repository. We also recommend that you join the [Docker Community Slack](https://www.docker.com/docker-community) and ask questions in **#docker-desktop-mac** channel. + +{% include eula-modal.html %} diff --git a/desktop/mac/edge-release-notes.md b/desktop/mac/edge-release-notes.md index 20a1c93d48..faf7887cf4 100644 --- a/desktop/mac/edge-release-notes.md +++ b/desktop/mac/edge-release-notes.md @@ -14,7 +14,11 @@ For information about Stable releases, see the [Stable release notes](release-no ## Docker Desktop Community 2.5.4 2020-12-07 -> [Download](https://desktop.docker.com/mac/edge/50534/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/50534/Docker.dmg){: .accept-eula } ### Upgrades @@ -32,7 +36,11 @@ For information about Stable releases, see the [Stable release notes](release-no ## Docker Desktop Community 2.5.3 2020-11-30 -> [Download](https://desktop.docker.com/mac/edge/50261/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/50261/Docker.dmg){: .accept-eula } ### Upgrades @@ -46,7 +54,11 @@ For information about Stable releases, see the [Stable release notes](release-no ## Docker Desktop Community 2.5.2 2020-11-26 -> [Download](https://desktop.docker.com/mac/edge/50165/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/50165/Docker.dmg){: .accept-eula } ### New @@ -62,7 +74,11 @@ For information about Stable releases, see the [Stable release notes](release-no ## Docker Desktop Community 2.5.1.0 2020-11-18 -> [Download](https://desktop.docker.com/mac/edge/49923/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/49923/Docker.dmg){: .accept-eula } This release contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing Docker Desktop. @@ -85,7 +101,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ## Docker Desktop Community 2.4.2.0 2020-10-19 -> [Download](https://desktop.docker.com/mac/edge/48975/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/48975/Docker.dmg){: .accept-eula } ### New @@ -115,7 +135,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ## Docker Desktop Community 2.4.1.0 2020-10-01 -> [Download](https://desktop.docker.com/mac/edge/48583/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/48583/Docker.dmg){: .accept-eula } ### Upgrades @@ -133,7 +157,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ## Docker Desktop Community 2.3.7.0 2020-09-17 -> [Download](https://desktop.docker.com/mac/edge/48173/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/48173/Docker.dmg){: .accept-eula } ### New @@ -163,7 +191,11 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for ## Docker Desktop Community 2.3.6.1 2020-09-08 -> [Download](https://desktop.docker.com/mac/edge/47792/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/47792/Docker.dmg){: .accept-eula } ### Upgrades @@ -176,7 +208,11 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for ## Docker Desktop Community 2.3.6.0 2020-09-01 -> [Download](https://desktop.docker.com/mac/edge/47622/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/47622/Docker.dmg){: .accept-eula } ### New @@ -203,7 +239,11 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for ## Docker Desktop Community 2.3.5.0 2020-08-21 -> [Download](https://desktop.docker.com/mac/edge/47376/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/47376/Docker.dmg){: .accept-eula } ### New @@ -233,7 +273,11 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for ## Docker Desktop Community 2.3.4.0 2020-07-28 -> [Download](https://desktop.docker.com/mac/edge/46980/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/46980/Docker.dmg){: .accept-eula } ### New @@ -254,7 +298,11 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for ## Docker Desktop Community 2.3.3.2 2020-07-21 -> [Download](https://desktop.docker.com/mac/edge/46784/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/46784/Docker.dmg){: .accept-eula } ### Upgrades @@ -269,7 +317,11 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for ## Docker Desktop Community 2.3.3.0 2020-07-09 -> [Download](https://desktop.docker.com/mac/edge/46574/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/46574/Docker.dmg){: .accept-eula } ### Upgrades @@ -287,7 +339,11 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for ## Docker Desktop Community 2.3.2.0 2020-06-25 -> [Download](https://desktop.docker.com/mac/edge/46268/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/46268/Docker.dmg){: .accept-eula } ### Upgrades @@ -310,7 +366,11 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for ## Docker Desktop Community 2.3.1.0 2020-05-20 -> [Download](https://desktop.docker.com/mac/edge/45408/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://desktop.docker.com/mac/edge/45408/Docker.dmg){: .accept-eula } ### New @@ -331,7 +391,11 @@ We appreciate you trying out an early version of the Mutagen file sync feature. ## Docker Desktop Community 2.3.0.1 2020-04-28 -> [Download](https://download.docker.com/mac/edge/44875/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://download.docker.com/mac/edge/44875/Docker.dmg){: .accept-eula } ### Bug fixes and minor changes @@ -340,7 +404,11 @@ We appreciate you trying out an early version of the Mutagen file sync feature. ## Docker Desktop Community 2.3.0.0 2020-04-20 -> [Download](https://download.docker.com/mac/edge/44472/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://download.docker.com/mac/edge/44472/Docker.dmg){: .accept-eula } ### Upgrades @@ -363,7 +431,11 @@ We appreciate you trying out an early version of the Mutagen file sync feature. ## Docker Desktop Community 2.2.3.0 2020-04-02 -> [Download](https://download.docker.com/mac/edge/43965/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://download.docker.com/mac/edge/43965/Docker.dmg){: .accept-eula } ### Upgrades @@ -395,7 +467,11 @@ We appreciate you trying out an early version of the Mutagen file sync feature. ## Docker Desktop Community 2.2.2.0 2020-03-02 -> [Download](https://download.docker.com/mac/edge/43066/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://download.docker.com/mac/edge/43066/Docker.dmg){: .accept-eula } This release contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing Docker Desktop. @@ -412,7 +488,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ## Docker Desktop Community 2.2.1.0 2020-02-12 -[Download](https://download.docker.com/mac/edge/42746/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://download.docker.com/mac/edge/42746/Docker.dmg){: .accept-eula } ### Upgrades @@ -422,7 +502,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ## Docker Desktop Community 2.1.7.0 2019-12-11 -[Download](https://download.docker.com/mac/edge/41561/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://download.docker.com/mac/edge/41561/Docker.dmg){: .accept-eula } > **Note:** Docker Desktop Edge 2.1.7.0 is the release candidate for the upcoming major Stable release. Please help us test this version before the wider release and report any issues in the [docker/for-mac](https://github.com/docker/for-mac/issues) GitHub repository. @@ -444,7 +528,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ## Docker Desktop Community 2.1.6.0 2019-11-18 -[Download](https://download.docker.com/mac/edge/40807/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Mac with Intel chip](https://download.docker.com/mac/edge/40807/Docker.dmg){: .accept-eula } ### Upgrades @@ -463,7 +551,11 @@ Added the ability to start and stop Compose-based applications and view combined ## Docker Desktop Community 2.1.5.0 2019-11-04 -[Download](https://download.docker.com/mac/edge/40323/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/40323/Docker.dmg){: .accept-eula } This release contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installation. @@ -492,7 +584,11 @@ Fixed an issue that caused VMs running on older hardware with macOS Catalina to ## Docker Desktop Community 2.1.4.0 2019-10-15 -[Download](https://download.docker.com/mac/edge/39357/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/39357/Docker.dmg){: .accept-eula } ### Upgrades @@ -511,7 +607,11 @@ Fixed an issue that caused VMs running on older hardware with macOS Catalina to ## Docker Desktop Community 2.1.3.0 2019-09-16 -[Download](https://download.docker.com/mac/edge/38275/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/38275/Docker.dmg){: .accept-eula } ### Bug fixes and minor changes @@ -523,7 +623,11 @@ Fixed an issue that caused VMs running on older hardware with macOS Catalina to ## Docker Desktop Community 2.1.2.0 2019-09-09 -[Download](https://download.docker.com/mac/edge/38030/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/38030/Docker.dmg){: .accept-eula } #### Upgrades @@ -542,7 +646,11 @@ Fixed an issue that caused VMs running on older hardware with macOS Catalina to ## Docker Desktop Community 2.1.1.0 2019-08-12 -[Download](https://download.docker.com/mac/edge/37260/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/37260/Docker.dmg){: .accept-eula } #### Upgrades @@ -559,7 +667,11 @@ Fixed an issue that caused VMs running on older hardware with macOS Catalina to ## Docker Desktop Community 2.1.0.0 2019-07-26 -[Download](https://download.docker.com/mac/edge/36792/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/36792/Docker.dmg){: .accept-eula } This release contains Kubernetes security improvements. Note that your local Kubernetes PKI and cluster will be reset after installation. @@ -587,7 +699,11 @@ This release contains Kubernetes security improvements. Note that your local Kub ## Docker Community Edition 2.0.5.0 2019-06-12 -[Download](https://download.docker.com/mac/edge/35318/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/35318/Docker.dmg){: .accept-eula } This is the Edge channel, which gives you early access to our newest features. Be aware that some of them may be experimental, and some of them may not ever reach the Stable release. @@ -615,14 +731,22 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ## Docker Community Edition 2.0.4.1 2019-05-07 -[Download](https://download.docker.com/mac/edge/34207/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/34207/Docker.dmg){: .accept-eula } * Bug fixes and minor changes - Upgrade QEMU from 2.8.0 to 3.1.0 to fix an emulation issue when building and running Java applications on Arm64 devices. ## Docker Community Edition 2.0.4.0 2019-04-30 -[Download](https://download.docker.com/mac/edge/33772/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/33772/Docker.dmg){: .accept-eula } * Upgrades - [Docker 19.03.0-beta3](https://github.com/docker/docker-ce/releases/tag/v19.03.0-beta3) @@ -646,7 +770,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus - Full BuildKit capabilities with container driver - Multiple builder instance support - Multi-node builds for cross-platform images (out-of-the-box support for linux/arm/v7 and linux/arm64) - - Parallel building of Compose files + - Concurrent building of Compose files - High-level build constructs with `bake` * Bug fixes and minor changes @@ -654,7 +778,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ## Docker Community Edition 2.0.3.0 2019-03-05 -[Download](https://download.docker.com/mac/edge/31778/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/31778/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.09.3](https://github.com/docker/docker-ce/releases/tag/v18.09.3) @@ -665,14 +793,22 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 2.0.2.1 2019-02-15 -[Download](https://download.docker.com/mac/edge/31274/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/31274/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.09.2](https://github.com/docker/docker-ce/releases/tag/v18.09.2), fixes [CVE-2019-5736](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5736) ## Docker Community Edition 2.0.2.0 2019-02-06 -[Download](https://download.docker.com/mac/edge/30972/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/30972/Docker.dmg){: .accept-eula } * Upgrades - [Docker Compose 1.24.0-rc1](https://github.com/docker/compose/releases/tag/1.24.0-rc1) @@ -689,7 +825,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ## Docker Community Edition 2.0.1.0 2019-01-11 -[Download](https://download.docker.com/mac/edge/30090/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/30090/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.09.1](https://github.com/docker/docker-ce/releases/tag/v18.09.1) @@ -711,7 +851,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 2.0.0.0-mac82 2018-12-07 -[Download](https://download.docker.com/mac/edge/29268/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/29268/Docker.dmg){: .accept-eula } * Upgrades - [Docker compose 1.23.2](https://github.com/docker/compose/releases/tag/1.23.2) @@ -719,7 +863,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 2.0.0.0-mac77 2018-11-14 -[Download](https://download.docker.com/mac/edge/28700/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/28700/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.09.0](https://github.com/docker/docker-ce-packaging/releases/tag/v18.09.0) @@ -734,7 +882,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 2.0.0.0-beta1-mac75 2018-09-14 -[Download](https://download.docker.com/mac/edge/27117/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/27117/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.09.0-ce-beta1](https://github.com/docker/docker-ce/releases/tag/v18.09.0-ce-beta1) @@ -752,7 +904,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 18.06.1-ce-mac74 2018-08-29 -[Download](https://download.docker.com/mac/edge/26766/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/26766/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.06.1-ce](https://github.com/docker/docker-ce/releases/tag/v18.06.1-ce) @@ -762,7 +918,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 18.06.0-ce-mac69 2018-07-25 -[Download](https://download.docker.com/mac/edge/26398/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/26398/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.06.0-ce](https://github.com/docker/docker-ce/releases/tag/v18.06.0-ce) @@ -773,7 +933,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 18.06.0-ce-rc3-mac68 2018-07-19 -[Download](https://download.docker.com/mac/edge/26342/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/26342/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.06.0-ce-rc3](https://github.com/docker/docker-ce/releases/tag/v18.06.0-ce-rc3) @@ -793,7 +957,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 18.05.0-ce-mac67 2018-06-07 -[Download](https://download.docker.com/mac/edge/25042/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/25042/Docker.dmg){: .accept-eula } * Upgrades - [LinuxKit v0.4](https://github.com/linuxkit/linuxkit/releases/tag/v0.4) @@ -810,7 +978,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 18.05.0-ce-mac66 2018-05-17 -[Download](https://download.docker.com/mac/edge/24545/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/24545/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.05.0-ce](https://github.com/docker/docker-ce/releases/tag/v18.05.0-ce) @@ -830,7 +1002,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 18.05.0-ce-rc1-mac63 2018-04-26 -[Download](https://download.docker.com/mac/edge/24246/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/24246/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.05.0-ce-rc1](https://github.com/docker/docker-ce/releases/tag/v18.05.0-ce-rc1) @@ -844,7 +1020,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 18.04.0-ce-mac62 2018-04-12 -[Download](https://download.docker.com/mac/edge/23965/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/23965/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.04.0-ce](https://github.com/docker/docker-ce/releases/tag/v18.04.0-ce) @@ -852,7 +1032,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 18.04.0-ce-rc2-mac61 2018-04-09 -[Download](https://download.docker.com/mac/edge/23890/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/23890/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.04.0-ce-rc2](https://github.com/docker/docker-ce/releases/tag/v18.04.0-ce-rc2) @@ -866,7 +1050,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 18.03.0-ce-mac58 2018-03-26 -[Download](https://download.docker.com/mac/edge/23607/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/23607/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.03.0-ce](https://github.com/docker/docker-ce/releases/tag/v18.03.0-ce) @@ -874,7 +1062,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 18.03.0-ce-rc4-mac57 2018-03-15 -[Download](https://download.docker.com/mac/edge/23352/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/23352/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.03.0-ce-rc4](https://github.com/docker/docker-ce/releases/tag/v18.03.0-ce-rc4) @@ -886,7 +1078,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 18.03.0-ce-rc3-mac56 2018-03-13 -[Download](https://download.docker.com/mac/edge/23287/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/23287/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.03.0-ce-rc3](https://github.com/docker/docker-ce/releases/tag/v18.03.0-ce-rc3) @@ -901,7 +1097,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 18.03.0-ce-rc1-mac54 2018-02-27 -[Download](https://download.docker.com/mac/edge/23022/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/23022/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.03.0-ce-rc1](https://github.com/docker/docker-ce/releases/tag/v18.03.0-ce-rc1) @@ -919,7 +1119,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 18.02.0-ce-mac53 2018-02-09 -[Download](https://download.docker.com/mac/edge/22617/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/22617/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.02.0-ce](https://github.com/docker/docker-ce/releases/tag/v18.02.0-ce) @@ -932,7 +1136,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 18.02.0-ce-rc2-mac51 2018-02-02 -[Download](https://download.docker.com/mac/edge/22446/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/22446/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.02.0-ce-rc2](https://github.com/docker/docker-ce/releases/tag/v18.02.0-ce-rc2) @@ -946,7 +1154,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 18.02.0-ce-rc1-mac50 2018-01-26 -[Download](https://download.docker.com/mac/edge/22256/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/22256/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.02.0-ce-rc1](https://github.com/docker/docker-ce/releases/tag/v18.02.0-ce-rc1) @@ -958,7 +1170,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 18.01.0-ce-mac48 2018-01-19 -[Download](https://download.docker.com/mac/edge/22004/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/22004/Docker.dmg){: .accept-eula } * Upgrades - [Docker 18.01.0-ce](https://github.com/docker/docker-ce/releases/tag/v18.01.0-ce) @@ -983,7 +1199,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 17.12.0-ce-mac45 2018-01-05 -[Download](https://download.docker.com/mac/edge/21669/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/21669/Docker.dmg){: .accept-eula } * Upgrades - [Docker 17.12.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.12.0-ce) @@ -999,7 +1219,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 17.12.0-ce-rc4-mac44 2017-12-21 -[Download](https://download.docker.com/mac/edge/21438/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/21438/Docker.dmg){: .accept-eula } * Upgrades - [Docker 17.12.0-ce-rc4](https://github.com/docker/docker-ce/releases/tag/v17.12.0-ce-rc4) @@ -1011,7 +1235,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 17.12.0-ce-rc3-mac43 2017-12-15 -[Download](https://download.docker.com/mac/edge/21270/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/21270/Docker.dmg){: .accept-eula } * Upgrades - [Docker 17.12.0-ce-rc3](https://github.com/docker/docker-ce/releases/tag/v17.12.0-ce-rc3) @@ -1038,7 +1266,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 17.11.0-ce-mac40 2017-11-22 -[Download](https://download.docker.com/mac/edge/20561/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/20561/Docker.dmg){: .accept-eula } * Upgrades - [Docker 17.11.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.11.0-ce) @@ -1082,7 +1314,11 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus ### Docker Community Edition 17.10.0-ce-mac36 2017-10-24 -[Download](https://download.docker.com/mac/edge/19824/Docker.dmg) +> Download Docker Desktop +> +> {%- include eula.md -%} +> +> [Download](https://download.docker.com/mac/edge/19824/Docker.dmg){: .accept-eula } * Upgrades - [Docker 17.10.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.10.0-ce) @@ -2513,3 +2749,5 @@ work yet. - Fixed permissions on `usr/local` symbolic links + +{% include eula-modal.html %} diff --git a/desktop/mac/images/diagnose-support.png b/desktop/mac/images/diagnose-support.png index 45ee2f818c..c83b555030 100644 Binary files a/desktop/mac/images/diagnose-support.png and b/desktop/mac/images/diagnose-support.png differ diff --git a/desktop/mac/images/menu/prefs-general.png b/desktop/mac/images/menu/prefs-general.png index 7dd3754c32..088638de38 100644 Binary files a/desktop/mac/images/menu/prefs-general.png and b/desktop/mac/images/menu/prefs-general.png differ diff --git a/desktop/mac/images/menu/prefs.png b/desktop/mac/images/menu/prefs.png index 8c807ab221..f18177424b 100644 Binary files a/desktop/mac/images/menu/prefs.png and b/desktop/mac/images/menu/prefs.png differ diff --git a/desktop/mac/images/snooze-update.png b/desktop/mac/images/snooze-update.png index 710f757355..7a616cce08 100644 Binary files a/desktop/mac/images/snooze-update.png and b/desktop/mac/images/snooze-update.png differ diff --git a/desktop/mac/images/subscription-terms.png b/desktop/mac/images/subscription-terms.png new file mode 100644 index 0000000000..09ebe0fece Binary files /dev/null and b/desktop/mac/images/subscription-terms.png differ diff --git a/desktop/mac/install.md b/desktop/mac/install.md index bea5660118..9831bf1594 100644 --- a/desktop/mac/install.md +++ b/desktop/mac/install.md @@ -6,18 +6,16 @@ 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. -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 %} +> 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 } ## System requirements -Your Mac must meet the following requirements to successfully install Docker Desktop. +Your Mac must meet the following requirements to install Docker Desktop successfully.
- -{% include eula.md %} diff --git a/get-started/index.md b/get-started/index.md index 39b2d5262b..f2919282f6 100644 --- a/get-started/index.md +++ b/get-started/index.md @@ -80,15 +80,13 @@ We also recommend the video walkthrough from DockerCon 2020. This tutorial assumes you have a current version of Docker installed on your machine. If you do not have Docker installed, choose your preferred operating system below to download Docker: -[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} -[Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn} +[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 .accept-eula } +[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 .accept-eula } +[Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn .accept-eula } [Linux](../engine/install/index.md){: .button .primary-btn} For Docker Desktop installation instructions, see [Install Docker Desktop on Mac](../desktop/mac/install.md) and [Install Docker Desktop on Windows](../desktop/windows/install.md). -{% include eula.md %} - ## Start the tutorial If you've already run the command to get started with the tutorial, congratulations! If not, open a command prompt or bash window, and run the command: @@ -166,3 +164,5 @@ Refer to the following topics for further documentation on all CLI commands used - [docker run](../engine/reference/commandline/run.md) - [docker image](../engine/reference/commandline/image.md) - [docker container](../engine/reference/commandline/container.md) + +{% include eula-modal.html %} diff --git a/js/docs.js b/js/docs.js index fd7b7f0d00..e88c4c19f3 100644 --- a/js/docs.js +++ b/js/docs.js @@ -190,6 +190,14 @@ $(document).ready(function () { }); }); +function initAcceptEULAModal() { + $("main").on("click", "a.accept-eula", function (e) { + e.preventDefault(); + _("#accept-eula .btn-primary").href = e.target.href; + $('#accept-eula').modal('show') + }); +} + function initNavToggle() { $("#menu-toggle").click(function (e) { e.preventDefault(); @@ -208,6 +216,7 @@ function initNavToggle() { ready(() => { renderNav() initNavToggle() + initAcceptEULAModal() $('[data-toggle="tooltip"]').tooltip() // sync tabs with the same data-group @@ -224,5 +233,5 @@ ready(() => { return 'Learn more about the "'+ c + '" Dockerfile command.' }, placement: "auto" - }); + }) }); diff --git a/subscription/add-seats.md b/subscription/add-seats.md index fb33dac2b6..010db11652 100644 --- a/subscription/add-seats.md +++ b/subscription/add-seats.md @@ -1,22 +1,22 @@ --- -description: Add seats to your plan +description: Add seats to your subscription keywords: Docker, Docker Hub, subscription, update, add, seats -title: Add seats to your plan +title: Add seats to your subscription redirect_from: - /docker-hub/billing/add-seats/ --- -You can manage your Docker Hub subscription anytime by adding seats to your plan. +You add seats anytime to your existing subscription. -## Add seats to a monthly plan +## Add seats to a monthly subscription > **Note:** > >- A monthly subscription includes monthly seats only. >- You must be a member of the ‘owners’ team to add seats to your organization. ->- When you add seats to your monthly plan in the middle of your billing cycle, you are charged a prorated amount for the additional seats. +>- When you add seats to your monthly subscription in the middle of your billing cycle, you are charged a prorated amount for the additional seats. -To add seats to a monthly plan: +To add seats to a monthly subscription: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. @@ -30,14 +30,14 @@ To add seats to a monthly plan: 6. Navigate to the **Members** tab to add new members. For more information, see [Add a member to a team](../orgs.md#add-a-member-to-a-team). -## Add seats to an annual plan +## Add seats to an annual subscription > **Note:** > > - An annual subscription includes annual seats only. -> - When you add seats to your plan in the middle of your billing cycle, you are charged a prorated amount for the additional seats. +> - When you add seats to your subscription in the middle of your billing cycle, you are charged a prorated amount for the additional seats. -To add annual seats to an annual plan: +To add annual seats to an annual subscription: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. diff --git a/subscription/downgrade.md b/subscription/downgrade.md index b57a7e8490..8f0e10698d 100644 --- a/subscription/downgrade.md +++ b/subscription/downgrade.md @@ -1,27 +1,27 @@ --- -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/ --- -You can downgrade your Pro or Team plan anytime. When you downgrade your plan, changes will be applied at the end of your billing cycle. +You can downgrade your Docker subscription anytime. When you downgrade your subscription, changes are applied at the end of your billing cycle. -For example, if you are currently on a **Team** plan which is billed on the 8th of every month and you choose to downgrade to a **Free** plan on the 15th, your plan will be active until 7th of the following month. You will be transferred to a Free plan on the 8th of the following month. +For example, if you are currently on a **Docker Team** subscription which is billed on the 8th of every month and you choose to downgrade to **Docker Personal** on the 15th, your plan will be active until 7th of the following month. You will be transferred to Docker Personal on the 8th of the following month. -The following sections contain instructions on how to downgrade from Pro and Team plans to a Free plan. +The following sections contain instructions on how to downgrade from a paid subscription to a Docker Personal tier. -## Downgrade from Pro to a Free plan +## Downgrade from Docker Pro to Docker Personal >**Note:** > -> - It is not possible to offer prorated refunds when you downgrade an annual plan that’s already paid for and is still active. After you have downgraded, you can choose to reinstate your annual plan if it hasn't expired. -> - Before you downgrade to a Free plan, ensure that your account details are updated to reflect features available in the Free plan. For example, you may need to convert any private repositories to public repositories. For information on what’s included in the Free plan, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. +> - It is not possible to offer prorated refunds when you downgrade an annual subscription that’s already paid for and is still active. After you have downgraded, you can choose to reinstate your annual subscription if it hasn't expired. +> - Before you downgrade to Docker Personal, ensure that your account details are updated to reflect features available in Docker Personal. For example, you may need to convert any private repositories to public repositories. For information on what’s included in the Docker Personal, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. {: .important } -To downgrade from a Pro plan to a Free plan: +To downgrade from a Docker Pro to Docker Personal: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. @@ -29,13 +29,13 @@ To downgrade from a Pro plan to a Free plan: 3. Ensure you have selected your personal account on the left side of the **Billing Details** page. -4. Click **Change plan** to downgrade your existing plan. +4. Click **Change plan** to downgrade your existing subscription. 5. On the **Change Plan** page, review the information displayed in the **Free** section and click **Downgrade**. 6. When prompted, review the warning displayed about downgrading your account and click **Continue with Downgrade**. -7. If your account meets the requirements of a Free plan, the **Downgrade confirmation** screen will be displayed. Click **continue**. +7. If your account meets the requirements of Docker Personal, the **Downgrade confirmation** screen will be displayed. Click **continue**. 8. We’d like to understand the reason for your downgrade. Select a reason for your downgrade from the list. Optionally, add a comment and select the checkbox to discuss your feedback with a member of the Docker team. Click **Send**. @@ -43,15 +43,15 @@ To downgrade from a Pro plan to a Free plan: 10. To cancel the downgrade, click **Cancel the downgrade**. -## Downgrade from Team to a Free plan +## Downgrade from Docker Team to Docker Free Team >**Note:** > -> - It is not possible to offer prorated refunds when you downgrade an annual plan that’s already paid for and is still active. After you have downgraded, you can choose to reinstate your annual plan if it hasn't expired. -> - Before you downgrade to a Free Team plan, you must convert all private repositories to public repositories and update the organization details to reflect features available in the Free plan. For example, you may need to reduce the number of team members. For information on what’s included in the Free plan, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. +> - It is not possible to offer prorated refunds when you downgrade an annual subscription that’s already paid for and is still active. After you have downgraded, you can choose to reinstate your annual subscription if it hasn't expired. +> - Before you downgrade to a Free Team, you must convert all private repositories to public repositories and update the organization details to reflect features available in the Free Team. For example, you may need to reduce the number of team members. For information on what’s included in the Free Team, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. {: .important } -To downgrade to a Free Team plan from a Team plan: +To downgrade to a Docker Free Team from Docker Team: 1. Log into an owner account for the organization in [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"}. @@ -65,7 +65,7 @@ To downgrade to a Free Team plan from a Team plan: 6. When prompted, review the warning displayed about downgrading your account and click **Continue with Downgrade**. -7. If your account meets the requirements of a Free plan, the **Downgrade confirmation** screen will be displayed. Click **continue**. +7. If your account meets the requirements of a Free Team plan, the **Downgrade confirmation** screen will be displayed. Click **continue**. 8. We’d like to understand the reason for your downgrade. Select a reason for your downgrade from the list. Optionally, add a comment and select the checkbox to discuss your feedback with a member of the Docker team. Click **Send**. diff --git a/subscription/faq.md b/subscription/faq.md index 1979c841fa..ed3444b429 100644 --- a/subscription/faq.md +++ b/subscription/faq.md @@ -89,7 +89,7 @@ Upgrading your legacy plan to a Pro plan offers you unlimited public and private ### How do I upgrade to a Team plan from a legacy organization plan? -Upgrading your legacy plan to a Team plan offers you unlimited private repos, unlimited teams, and 3 parallel builds. For information on how to upgrade to a Team plan from a legacy (per-repository) plan, see the [How To Upgrade](upgrade.md){:target="blank" rel="noopener" class=""} page. +Upgrading your legacy plan to a Team plan offers you unlimited private repos, unlimited teams, and 3 concurrent builds. For information on how to upgrade to a Team plan from a legacy (per-repository) plan, see the [How To Upgrade](upgrade.md){:target="blank" rel="noopener" class=""} page. ### How do downgrades from a Pro or Team plan work? When you downgrade your Pro or Team plan, changes are applied at the end of your billing cycle. For example, if you are currently on a Team plan which is billed on the 8th of every month and you choose to downgrade to a Free Team plan on the 15th, your Team plan will be active until 7th of the following month. You will be transferred to a Free Team plan on the 8th of the following month. Please refer to the next two questions below for instructions on how to downgrade your account. diff --git a/subscription/images/billing-personal-account.png b/subscription/images/billing-personal-account.png index 3261faa261..334e9de2c9 100644 Binary files a/subscription/images/billing-personal-account.png and b/subscription/images/billing-personal-account.png differ diff --git a/subscription/index.md b/subscription/index.md index 78253ec5e8..9499838566 100644 --- a/subscription/index.md +++ b/subscription/index.md @@ -1,36 +1,82 @@ --- description: Docker subscription overview -keywords: Docker, pricing, billing, Pro, Team, subscription, plans, +keywords: Docker, pricing, billing, Pro, Team, business, 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="_" id="dkr_docs_subscription_btl"} updates and extensions to our product subscriptions to increase productivity, collaboration, and added security for our developers and businesses. 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 organizations using Docker at scale for application development and require features like secure software supply chain management, single sign-on (SSO), container registry access controls, and more. -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. +- Our [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} includes a change to the terms for **Docker Desktop**. + - Docker Desktop **remains free** for small businesses (fewer than 250 employees AND less than $10 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 August 31, 2021. There is a grace period until January 31, 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. -**For individuals:** +To understand how these changes affect you, read the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}. -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. +The following sections provide an overview of each tier. To compare features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}. + +## 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 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="_" id="dkr_docs_subscription_btl"}. + +## Docker Pro + +**Docker Pro** enables individual developers to get more control of their development environment and provides an integrated and reliable developer experience. It reduces the amount of time developers spend on mundane and repetitive tasks and empowers developers to spend more time creating value for their customers. + +Docker Pro includes all the features available in Personal, additionally, it includes unlimited private repositories, unlimited public repositories, unlimited [collaborators](../docker-hub/repos.md#collaborators-and-their-role) for public repositories, [Auto Builds](../docker-hub/builds/index.md) with 5 concurrent builds, 300 [Hub Vulnerability Scans](../docker-hub/vulnerability-scanning.md), 5 [Scoped Access Tokens](../docker-hub/access-tokens.md), and more. + +For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}. + +## 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 includes everything included in Docker Pro, plus unlimited private repositories, [Auto Builds](../docker-hub/builds/index.md) with 15 concurrent builds, unlimited [Scoped Access Tokens](../docker-hub/access-tokens.md), advanced collaboration and management tools, including organization and team management with Role Based Access Control (RBAC) for the whole team, [Audit Logs](../docker-hub/audit-log.md), and more. + +For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}. + +## 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 accelerate their secure software supply chain initiatives. + +In addition to all the features available in Docker Pro and Docker Team, Docker Business includes centralized management, [Image Access Management](../docker-hub/image-access-management.md) with 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, SAML SSO (_Coming soon_), Remote Management (_Coming soon_). + +For a list of features available in each tier, see [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}. + +## Docker Desktop License Agreement + +Docker Desktop is licensed under the Docker Subscription Service Agreement. When you download and install Docker Desktop, you will be asked to agree to the updated terms. + +> **Docker Subscription Service Agreement** +> +> We’ve updated the [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}. Please read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} and [FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"} to learn how companies using Docker Desktop may be affected. + +**Here’s a summary of the key changes:** + +- Our Docker Subscription Service Agreement include a change to the terms of use for Docker Desktop + - It **remains free** for small businesses (fewer than 250 employees AND less than $10 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 August 31, 2021. There is a **grace period** until January 31, 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. + +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** > -> 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. - -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 development teams:** - -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 **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 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="_"}. - -For frequently asked questions about pricing, see [Docker pricing FAQ](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}. +> The licensing and distribution terms for Docker and Moby **open-source** projects, such as Docker Engine, are not changing. diff --git a/subscription/remove-seats.md b/subscription/remove-seats.md index 83f5968b4f..9bb8fae3c6 100644 --- a/subscription/remove-seats.md +++ b/subscription/remove-seats.md @@ -1,22 +1,22 @@ --- -description: Remove seats from your plan +description: Remove seats from your subscription keywords: Docker, Docker Hub, subscription, update, remove, seats -title: Remove seats from your plan +title: Remove seats from your subscription redirect_from: - /docker-hub/billing/remove-seats/ --- -You can manage your Docker Hub subscription anytime by removing seats from your plan. If you remove seats in the middle of the billing cycle, changes are applied immediately and reflect in the next billing cycle. +You can manage your Docker Hub subscription anytime by removing seats from your subscription. If you remove seats in the middle of the billing cycle, changes are applied immediately and reflect in the next billing cycle. -For example, if you receive your billing on the 8th of every month for 10 seats and you want to remove 2 seats on the 15th of the month, the 2 seats are removed immediately. Your payment for 8 seats begins the next month. If you are on the annual plan, the 2 seats are removed immediately, and your payment for the 8 seats begins next year. +For example, if you receive your billing on the 8th of every month for 10 seats and you want to remove 2 seats on the 15th of the month, the 2 seats are removed immediately. Your payment for 8 seats begins the next month. If you are on the annual subscription, the 2 seats are removed immediately, and your payment for the 8 seats begins next year. -## Remove seats from a monthly or an annual plan +## Remove seats from a monthly or an annual subscription > **Note:** > > - You must be a member of the ‘Owners’ team to remove seats from your organization. > -To remove seats from a monthly or an annual plan: +To remove seats from a monthly or an annual subscription: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. @@ -24,7 +24,7 @@ To remove seats from a monthly or an annual plan: 3. Select the **Billing** tab and click **Remove seats**. -4. Specify how many seats you’d like to reduce from the existing plan and click **Remove** to confirm. +4. Specify how many seats you’d like to reduce from the existing subscription and click **Remove** to confirm. 5. The **Billing** tab confirms the seat removal and the details on when the changes will take effect. diff --git a/subscription/upgrade.md b/subscription/upgrade.md index 16d3e66cc9..594df21811 100644 --- a/subscription/upgrade.md +++ b/subscription/upgrade.md @@ -1,37 +1,33 @@ --- -description: Upgrading your Docker Hub Plan -keywords: Docker Hub, upgrade, subscription, Pro, Team, pricing plan, -title: Upgrade your plan +description: Upgrading your Docker subscription +keywords: Docker Hub, upgrade, subscription, Pro, Team, business, pricing plan, +title: Upgrade your subscription redirect_from: - /docker-hub/upgrade/ - /docker-hub/billing/upgrade/ --- -This page contains information on how to purchase a Pro or a Team plan. It also contains information on how to upgrade your existing plan and update your billing information. You can upgrade to a Pro or a Team plan from a Free plan, or from your current legacy plan. When you upgrade to a Pro or a Team plan, you can immediately use all the features and entitlements offered in your new plan. For detailed information on features available in each plan, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. +This page contains information on how to purchase a Docker paid subscription. It also contains information on how to upgrade your existing subscription and update your billing information. -> **Note:** -> -> If you were previously on a legacy per-repository plan, your plan has been converted to a new Pro or Team monthly plan. For details, see [Pricing FAQ](faq.md). +You can upgrade to a Docker Pro, Team, or a Business subscription from a Personal subscription. When you upgrade to a paid subscription, you can immediately use all the features and entitlements offered in your new subscription. For detailed information on features available in each subscription, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}. -## Purchase a Pro plan +## Purchase Docker Pro -The following section contains information on how to purchase a Pro plan for new customers. +The following section contains information on how to purchase a Docker Pro subscription for new customers. -To purchase a Pro plan: +To purchase Docker Pro: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. 2. Open the drop-down menu next to your username in the top-right corner and select **Billing** to go to the **Billing Details** page. This page displays billing information about your existing user account. - The Docker Hub **Pricing** page displays information about the new pricing plans. - 3. Ensure you have selected your personal account on the left side of the **Billing Details** page. 4. Click **Change plan**. -5. Review the plan details in the **Pro** section and click **Upgrade Now**. +5. The Docker Hub **Pricing** page displays information about the new subscription. Review the subscription details in the **Pro** section and click **Upgrade Now**. -5. The **Payment Method** page displays the cost for the annual plan by default. If you prefer to opt for the monthly plan, choose **pay monthly**. +5. The **Payment Method** page displays the cost for the annual subscription by default. If you prefer to opt for the monthly subscription, choose **Pay Monthly**. 6. Enter the card details and click **Purchase**. @@ -39,26 +35,26 @@ To purchase a Pro plan: 8. Open the drop-down menu next to your username in the top-right corner and select **Billing**. - The **Billing** page displays information about your new Pro plan and the total cost. + The **Billing** page displays information about your new subscription and the total cost. -## Purchase a Team plan +## Purchase Docker Team -The following section contains information on how to purchase a Team plan for new organizations. If you do not have a team plan, click here to learn more on how to create a team. +The following section contains information on how to purchase a Docker Team subscription for new organizations. If you do not have a team yet, see [create a team](../docker-hub/orgs.md#create-a-team) for instructions on how to create a new team. -To purchase a Team plan: +To purchase Docker Team: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. 2. Click **Organizations** in the toolbar and select your organization. 3. Click the **Billing** tab and click **Change plan**. - The Docker Hub **Pricing** page displays information about the new pricing plans. + The Docker Hub **Pricing** page displays information about the new subscription. -4. Review the plan details in the **Team** section and click **Buy Now**. +4. Review the subscription details in the **Team** section and click **Buy Now**. 5. Enter a name for your new organization and add a company name. -6. The **Organization size** page displays the cost for the annual plan by default. If you prefer to change this, select **Pay Monthly**. +6. The **Organization size** page displays the cost for the annual subscription by default. If you prefer to change this, select **Pay Monthly**. 7. Specify the number of users you’d like to add to your organization and click **Continue to Payment**. @@ -66,11 +62,15 @@ To purchase a Team plan: 9. Verify your email address. -10. Navigate to Organizations from the menu at the top of the page, choose your organization, and select **Billing**. The Billing tab displays information about your new Team plan and the total cost. +10. Navigate to Organizations from the menu at the top of the page, choose your organization, and select **Billing**. The Billing tab displays information about your new Docker Team subscription and the total cost. -## Upgrade to a Pro plan +## Purchase Docker Business -To upgrade to a Pro plan: +The Docker Business subscription is currently available to purchase through the Docker Sales team. To purchase a Docker Business subscription, [Contact Sales](https://www.docker.com/pricing/contact-sales){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}. + +## Upgrade to Docker Pro + +To upgrade to Docker Pro: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. @@ -80,21 +80,21 @@ To upgrade to a Pro plan: ![Billing details personal account](images/billing-personal-account.png){:width="750px"} -4. Click **Change plan** to choose a new plan. +4. Click **Change plan** to choose a new subscription. -5. Review the plan details in the **Pro** section and click **Buy Now**. +5. Review the details in the **Pro** section and click **Buy Now**. -6. By default, the **Payment Method** page displays the annual cost to upgrade to a Pro plan. If you prefer to upgrade to a monthly plan, choose **pay monthly**. +6. By default, the **Payment Method** page displays the annual cost to upgrade to Docker Pro. If you prefer to upgrade to a monthly subscription, choose **pay monthly**. 7. Review the card details and the information displayed and click **Purchase** to confirm. - The **Billing** page now displays a confirmation of the upgrade with an invoice containing details about your new plan, entitlements, and the total cost. + The **Billing** page now displays a confirmation of the upgrade with an invoice containing details about your new subscription, entitlements, and the total cost. -8. You’ll also receive an email confirming the cancellation of your legacy plan. +8. You’ll also receive an email confirming the cancellation of your legacy subscription. -## Upgrade to a Team plan +## Upgrade to Docker Team -To upgrade to a Team plan: +To upgrade to Docker Team subscription: 1. Log into an owner account for the organization in [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"}. @@ -102,42 +102,46 @@ To upgrade to a Team plan: 3. Select the **Billing** tab. -4. Click **Change plan** to upgrade to a new plan. +4. Click **Change plan** to upgrade to a new subscription. -5. Review the plan details in the **Team** section and click **Buy Now**. +5. Review the details in the **Team** section and click **Buy Now**. -6. By default, the plan displays the annual cost to upgrade the existing number of users to a Team plan. To switch to a monthly plan, click **Pay Monthly**. +6. By default, the subscription displays the annual cost to upgrade the existing number of users to a Docker Team subscription. To switch to a monthly subscription, click **Pay Monthly**. 7. Review and adjust the number of users as required and click **Continue to payment**. 8. Review the card details and click **Purchase** to confirm. - The **Billing page** now displays a confirmation of the upgrade with an invoice containing details about your new plan, entitlements, and the total cost. + The **Billing page** now displays a confirmation of the upgrade with an invoice containing details about your new subscription, entitlements, and the total cost. - You’ll also receive an email confirming the cancellation of your legacy plan. + You’ll also receive an email confirming the cancellation of your legacy subscription. -## Upgrade from a monthly Team plan to an annual plan +## Upgrade to Docker Business -To upgrade from a monthly Team plan to an annual Team plan: +To upgrade to a Docker Business subscription, [Contact Sales](https://www.docker.com/pricing/contact-sales){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}. + +## Upgrade from a monthly Team to an annual subscription + +To upgrade from a monthly Team subscription to an annual Team subscription: 1. Log into an owner account for the organization in [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"}. 2. Navigate to **Organizations** from the menu at the top of the page, choose your organization, and select the **Billing** tab. 3. Click **switch to annual billing**. -4. Review the information displayed on the **Change to an Annual Plan** page and click **Accept Terms and Purchase** to confirm. +4. Review the information displayed on the **Change to an Annual subscription** page and click **Accept Terms and Purchase** to confirm. - The Billing page now displays a confirmation of the upgrade with an invoice containing details about your new plan, entitlements, and the total cost. + The Billing page now displays a confirmation of the upgrade with an invoice containing details about your new subscription, entitlements, and the total cost. -## Upgrade from a monthly Pro plan to an annual plan +## Upgrade from a monthly Pro to an annual subscription -To upgrade from a monthly Pro plan to an annual Pro plan: +To upgrade from a monthly Pro subscription to an annual Pro subscription: 1. Log into your [Docker Hub](https://hub.docker.com){: target="_blank" rel="noopener" class="_"} account. 2. Open the drop-down menu next to your username in the top-right corner and select **Billing** to go to the **Billing Details** page. This page displays billing information about your existing user account. 3. Ensure you have selected your personal account on the left side of the **Billing Details** page. 4. Click **switch to annual billing**. -5. Review the information displayed on the **Change to an Annual Plan** page and click **Accept Terms and Purchase** to confirm. +5. Review the information displayed on the **Change to an Annual subscription** page and click **Accept Terms and Purchase** to confirm. - The Billing page now displays a confirmation of the upgrade with an invoice containing details about your new plan, entitlements, and the total cost. + The Billing page now displays a confirmation of the upgrade with an invoice containing details about your new subscription, entitlements, and the total cost. ## Update billing information