mirror of https://github.com/docker/docs.git
More updates related to subscription changes, address review comments
Signed-off-by: Usha Mandya <usha.mandya@docker.com>
This commit is contained in:
parent
8c302969af
commit
e73cdcf0f1
13
_config.yml
13
_config.yml
|
@ -31,18 +31,15 @@ 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/sites/default/files/d8/2021-01/Docker%2520Data%2520Processing%2520Agreement%25202021.pdf" # Docker Subscription Service Terms
|
||||
dsst_url: "https://www.docker.com/legal/docker-subscription-service-agreement" # Docker Subscription Service Agreement
|
||||
|
||||
# Link to Docker Subscription Service Terms announcement blog-post
|
||||
# TODO add final link to Docker Subscription Service Terms announcement blog-post
|
||||
dsst_announcement_url: "XXXXXXX ADD BLOG LINK"
|
||||
# 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 Terms FAQst
|
||||
# TODO add link to Docker Subscription Service Terms FAQs
|
||||
dsst_faqs_url: "XXXXXXX ADD FAQs LINK"
|
||||
# Link to Docker Subscription Service Agreement FAQs
|
||||
dsst_faqs_url: "https://www.docker.com/pricing/faq"
|
||||
|
||||
# Link to Docker Terms of Service
|
||||
# TODO add 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
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
<!-- This is a summary of the license changes related to Docker Desktop. It is included in the Mac and Windows Install topic -->
|
||||
|
||||
> **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="_"}. Please read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} and [FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"} 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 31 January 2022 for those that will require a paid subscription to use Docker Desktop.
|
||||
- The existing Docker Free subscription has been renamed **Docker Personal** and we have introduced a Docker Business subscription .
|
||||
- The Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop.
|
||||
|
||||
|
|
@ -4,19 +4,17 @@ When an update is available, Docker Desktop displays an icon to indicate the ava
|
|||
|
||||
To encourage developers to stay up to date, Docker Desktop displays a reminder two weeks after an update becomes available. You can dismiss this daily reminder by clicking **Snooze**. You can skip an update when a reminder appears by clicking the **Skip this update** option.
|
||||
|
||||
> **Docker Subscription Service Terms**
|
||||
> **Docker Subscription Service Agreement**
|
||||
>
|
||||
> Beginning on August 31, 2021, you must agree to the [Docker Subscription Service Terms](https://www.docker.com/legal/docker-terms-service){: target="_blank" rel="noopener" class="_"} to continue using Docker Desktop. Read the [Blog](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} and the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"} to learn more about the changes.
|
||||
|
||||
{:width="500px"}
|
||||
> 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 Subscription Service Terms window. Read the information presented on the screen to understand how the changes impact you. Click the checkbox to indicate that you accept the terms of service and then click **Accept** to continue.
|
||||
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 of service.
|
||||
Docker Desktop starts after you accept the terms.
|
||||
|
|
|
@ -9,14 +9,14 @@
|
|||
</div>
|
||||
<div class="modal-body">
|
||||
<p>
|
||||
We've updated the <a href="{{ site.dsst_url }}" target="_blank" rel="noopener" class="_">Docker Subscription Service Terms</a>.
|
||||
Please read <a href="{{ site.dsst_announcement_url }}" target="_blank" rel="noopener" class="_">the announcement</a>
|
||||
and <a href="{{ site.dsst_faqs_url }}" target="_blank" rel="noopener" class="_">FAQs</a>
|
||||
We've updated the <a href="https://www.docker.com/legal/docker-subscription-service-agreement" target="_blank" rel="noopener" class="_">Docker Subscription Service Agreement</a>.
|
||||
Please read <a href="https://www.docker.com/blog/updating-product-subscriptions/" target="_blank" rel="noopener" class="_" id="dkr_docs_relnotes_blog_btl">the announcement</a>
|
||||
and <a href="https://www.docker.com/pricing/faq" target="_blank" rel="noopener" class="_">FAQs</a>
|
||||
to learn how companies using Docker Desktop may be affected.
|
||||
</p>
|
||||
<p>
|
||||
By clicking “Accept and Download”, you agree to these updated
|
||||
<a href="{{ site.tos_url }}" target="_blank" rel="noopener" class="_">terms of service</a>,
|
||||
By clicking "Accept and Download", you agree to these updated
|
||||
<a href="{{ site.tos_url }}" target="_blank" rel="noopener" class="_">terms</a>,
|
||||
the <a href="https://www.docker.com/legal/data-processing-agreement" target="_blank" rel="noopener" class="_">Docker Data Processing Agreement</a>,
|
||||
and the <a href="https://www.docker.com/legal/docker-privacy-policy" target="_blank" rel="noopener" class="_">Data Privacy Policy</a>.
|
||||
</p>
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<!-- This text will be included in topics containing Docker Desktop download URLs -->
|
||||
<span class="no-js">We've updated the [Docker Subscription Service Terms]({{ site.dsst_url }}){: target="_blank" rel="noopener" class="_"}.
|
||||
<span class="no-js">We've updated the [Docker Subscription Service Agreement]({{ site.dsst_url }}){: target="_blank" rel="noopener" class="_"}.
|
||||
Please [read the announcement]({{ site.dsst_announcement_url }}){: target="_blank" rel="noopener" class="_"}
|
||||
and [FAQs]({{ site.dsst_faqs_url }}){: target="_blank" rel="noopener" class="_"}
|
||||
to learn how companies using Docker Desktop may be affected.
|
||||
By downloading Docker Desktop, you agree to these updated [terms of service]({{ site.tos_url }}){: target="_blank" rel="noopener" class="_"},
|
||||
By downloading Docker Desktop, you agree to these updated [terms]({{ site.tos_url }}){: target="_blank" rel="noopener" class="_"},
|
||||
the [Docker Data Processing Agreement](https://www.docker.com/legal/data-processing-agreement){: target="_blank" rel="noopener" class="_"},
|
||||
and the [Data Privacy Policy](https://www.docker.com/legal/docker-privacy-policy){: target="_blank" rel="noopener" class="_"}.</span>
|
||||
|
|
|
@ -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).
|
||||
|
|
|
@ -223,13 +223,13 @@ 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 Docker Pro, Team, or a Business subscription."
|
||||
|
@ -241,14 +241,14 @@ The following table lists the Volumes UI features available in each plan:
|
|||
|
||||
{% assign yes = '{: .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
|
||||
|
||||
|
|
|
@ -17,10 +17,10 @@ For information about Docker Desktop system requirements, see [Docker Desktop fo
|
|||
|
||||
### Do I need to pay to use Docker Desktop?
|
||||
|
||||
Docker Desktop remains free for small businesses (fewer than 250 employees AND less than $1 million in revenue), personal use, education, and non-commercial open source projects. It requires a paid subscription for professional use in larger enterprises.
|
||||
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 31 August 2021. There is a grace period until 31 January 2022 for those that will require a paid subscription to use Docker Desktop.
|
||||
|
||||
When downloading and installing Docker Desktop, you will be asked to agree to the [Docker Subscription Service Terms](https://www.docker.com/legal/docker-terms-service){: target="_blank" rel="noopener" class="_"}.
|
||||
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="_"}.
|
||||
|
||||
|
@ -134,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?
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ Download Docker Desktop for Mac on Apple silicon:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for 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 }
|
||||
> [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 }
|
||||
|
||||
<br>
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@ For information about Stable releases, see the [Stable release notes](release-no
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/50261/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/edge/50261/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -58,7 +58,7 @@ For information about Stable releases, see the [Stable release notes](release-no
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/50165/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/edge/50165/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -78,7 +78,7 @@ For information about Stable releases, see the [Stable release notes](release-no
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/49923/Docker.dmg){: .accept-eula }
|
||||
> [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.
|
||||
|
||||
|
@ -105,7 +105,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/48975/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/edge/48975/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -139,7 +139,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/48583/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/edge/48583/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -161,7 +161,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/48173/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/edge/48173/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -195,7 +195,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/47792/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/edge/47792/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -212,7 +212,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/47622/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/edge/47622/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -243,7 +243,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/47376/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/edge/47376/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -277,7 +277,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/46980/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/edge/46980/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -321,7 +321,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/46574/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/edge/46574/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -343,7 +343,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/46268/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/edge/46268/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -370,7 +370,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/edge/45408/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/edge/45408/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -395,7 +395,7 @@ We appreciate you trying out an early version of the Mutagen file sync feature.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/44875/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/edge/44875/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
||||
|
@ -408,7 +408,7 @@ We appreciate you trying out an early version of the Mutagen file sync feature.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/44472/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/edge/44472/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -435,7 +435,7 @@ We appreciate you trying out an early version of the Mutagen file sync feature.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/43965/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/edge/43965/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -471,7 +471,7 @@ We appreciate you trying out an early version of the Mutagen file sync feature.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/43066/Docker.dmg){: .accept-eula }
|
||||
> [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.
|
||||
|
||||
|
@ -492,7 +492,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/42746/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/edge/42746/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -506,7 +506,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/41561/Docker.dmg){: .accept-eula }
|
||||
> [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.
|
||||
|
||||
|
@ -532,7 +532,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/edge/40807/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/edge/40807/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -770,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
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 141 KiB After Width: | Height: | Size: 112 KiB |
|
@ -10,10 +10,8 @@ Welcome to Docker Desktop for Mac. This page contains information about Docker D
|
|||
|
||||
> Download Docker Desktop for Mac
|
||||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [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 }
|
||||
> [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
|
||||
|
||||
|
@ -73,33 +71,18 @@ The Docker Desktop installation includes
|
|||
|
||||

|
||||
|
||||
3. The Docker menu ({: .inline}) displays the Subscription Service Terms window. It includes a change to the terms of use for Docker Desktop.
|
||||
3. The Docker menu ({: .inline}) displays the Docker Subscription Service Agreement window. It includes a change to the terms of use for Docker Desktop.
|
||||
|
||||
> **Docker Subscription Service Terms**
|
||||
>
|
||||
> Beginning on August 31, 2021, you must agree to the [Docker Subscription Service Terms](https://www.docker.com/legal/docker-terms-service){: target="_blank" rel="noopener" class="_"} to continue using Docker Desktop. Read the information presented on the screen to understand how the changes impact you.
|
||||
{% include desktop-license-update.md %}
|
||||
|
||||
{:width="700px"}
|
||||
|
||||
**Here’s a summary of the key changes:**
|
||||
|
||||
- Docker Subscription Service Terms include a change to the terms of use for Docker Desktop
|
||||
- It remains free for small businesses (fewer than 250 employees AND less than $1 million in revenue), personal use, education, and non-commercial open source projects.
|
||||
- It requires a paid subscription for professional use in larger enterprises.
|
||||
- The effective date of these terms is 31 August 2021. There is a grace period until 31 January 2022 for those that will require a paid subscription to use Docker Desktop.
|
||||
- The existing Docker Free subscription has been renamed Docker Personal and we have introduced a Docker Business subscription .
|
||||
The Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop.
|
||||
|
||||
The [blog post](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} and the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"} also give you detailed information about the changes.
|
||||
|
||||
4. Click the checkbox to indicate that you accept the terms of service and then click **Accept** to continue. Docker Desktop starts after you accept the terms of service.
|
||||
Click the checkbox to indicate that you accept the updated terms and then click **Accept** to continue. Docker Desktop starts after you accept the terms.
|
||||
|
||||
> **Important**
|
||||
>
|
||||
> If you do not agree to the terms of service, the Docker Desktop application will close and you can no longer run Docker Desktop on your machine. You can choose to accept the terms at a later date by opening Docker Desktop.
|
||||
> 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}
|
||||
|
||||
For more information, see [Docker Desktop license terms](/subscription/#docker-desktop-license-terms).
|
||||
For more information, see [Docker Desktop License Agreement](/subscription/#docker-desktop-license-agreement).
|
||||
|
||||
### Quick start guide
|
||||
|
||||
|
|
|
@ -13,9 +13,11 @@ This page contains release notes for older versions of Docker Desktop for Mac.
|
|||
## Docker Desktop Community 2.5.0.1
|
||||
2020-11-10
|
||||
|
||||
> Download Docker Desktop
|
||||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/49550/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/49550/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -32,14 +34,14 @@ This page contains release notes for older versions of Docker Desktop for Mac.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/49427/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/49427/Docker.dmg){: .accept-eula }
|
||||
|
||||
Docker Desktop 2.5.0.0 contains a Kubernetes upgrade. Your local Kubernetes cluster will be reset after installing this version.
|
||||
|
||||
### New
|
||||
|
||||
- Users subscribed to a Pro or a Team plan can now see the vulnerability scan report on the Remote repositories tab in Docker Desktop.
|
||||
- Docker Desktop introduces a support option for users who have subscribed to a Pro or a Team Plan.
|
||||
- Users with a paid Docker subscription plan can now see the vulnerability scan report on the Remote repositories tab in Docker Desktop.
|
||||
- Docker Desktop introduces a support option for users with a paid Docker subscription.
|
||||
|
||||
### Security
|
||||
|
||||
|
@ -76,7 +78,7 @@ Docker Desktop 2.5.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/48506/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/48506/Docker.dmg){: .accept-eula }
|
||||
|
||||
Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes cluster will be reset after installing this version.
|
||||
|
||||
|
@ -127,7 +129,7 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/48029/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/48029/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -155,7 +157,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/46911/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/46911/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -177,7 +179,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/45519/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/45519/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -195,7 +197,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/45183/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/45183/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -231,7 +233,7 @@ Docker Desktop introduces a new onboarding tutorial upon first startup. The Quic
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/43884/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/43884/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
||||
|
@ -244,7 +246,7 @@ Docker Desktop introduces a new onboarding tutorial upon first startup. The Quic
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/43472/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/43472/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -262,7 +264,7 @@ Docker Desktop introduces a new onboarding tutorial upon first startup. The Quic
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/42716/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/42716/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -276,7 +278,7 @@ Docker Desktop introduces a new onboarding tutorial upon first startup. The Quic
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/42247/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/42247/Docker.dmg){: .accept-eula }
|
||||
|
||||
Docker Desktop 2.2.0.0 contains a Kubernetes upgrade. Your local Kubernetes cluster will be reset after installing this version.
|
||||
|
||||
|
@ -329,7 +331,7 @@ For detailed information about the new Dashboard UI, see [Docker Desktop Dashboa
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/40693/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/40693/Docker.dmg){: .accept-eula }
|
||||
|
||||
Docker Desktop 2.1.0.5 contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing this version.
|
||||
|
||||
|
@ -346,7 +348,7 @@ Docker Desktop 2.1.0.5 contains a Kubernetes upgrade. Note that your local Kuber
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/39773/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/39773/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -367,7 +369,7 @@ For more information, see [Two-factor authentication](index.md#docker-hub).
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/38240/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/38240/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -384,7 +386,7 @@ For more information, see [Two-factor authentication](index.md#docker-hub).
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/37877/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/37877/Docker.dmg){: .accept-eula }
|
||||
|
||||
Docker Desktop 2.1.0.2 contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing this version.
|
||||
|
||||
|
@ -402,7 +404,7 @@ Docker Desktop 2.1.0.2 contains a Kubernetes upgrade. Note that your local Kuber
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/37199/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/37199/Docker.dmg){: .accept-eula }
|
||||
|
||||
Note that you must sign in and create a Docker ID in order to download Docker Desktop.
|
||||
|
||||
|
@ -467,7 +469,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/31259/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/31259/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)
|
||||
|
@ -478,7 +480,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/30215/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/30215/Docker.dmg){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 18.09.1](https://github.com/docker/docker-ce/releases/tag/v18.09.1)
|
||||
|
@ -498,7 +500,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/29211/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/29211/Docker.dmg){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker compose 1.23.2](https://github.com/docker/compose/releases/tag/1.23.2)
|
||||
|
@ -509,7 +511,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/28905/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/28905/Docker.dmg){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 18.09.0](https://github.com/docker/docker-ce-packaging/releases/tag/v18.09.0)
|
||||
|
@ -538,7 +540,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/26764/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/26764/Docker.dmg){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 18.06.1-ce](https://github.com/docker/docker-ce/releases/tag/v18.06.1-ce)
|
||||
|
@ -552,7 +554,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/26399/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/26399/Docker.dmg){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 18.06.0-ce](https://github.com/docker/docker-ce/releases/tag/v18.06.0-ce)
|
||||
|
@ -587,7 +589,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/24312/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/24312/Docker.dmg){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 18.03.1-ce](https://github.com/docker/docker-ce/releases/tag/v18.03.1-ce)
|
||||
|
@ -603,7 +605,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/24245/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/24245/Docker.dmg){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 18.03.1-ce](https://github.com/docker/docker-ce/releases/tag/v18.03.1-ce)
|
||||
|
@ -619,7 +621,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/23751/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/23751/Docker.dmg){: .accept-eula }
|
||||
|
||||
* Bug fixes and minor changes
|
||||
- Fix Upgrade straight from 17.09 versions where Docker for Mac cannot restart once the upgrade has been performed. Fixes [docker/for-mac#2739](https://github.com/docker/for-mac/issues/2739)
|
||||
|
@ -630,7 +632,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/23608/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/23608/Docker.dmg){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 18.03.0-ce](https://github.com/docker/docker-ce/releases/tag/v18.03.0-ce)
|
||||
|
@ -662,7 +664,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/23011/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/23011/Docker.dmg){: .accept-eula }
|
||||
|
||||
* Bug fixes and minor changes
|
||||
- Revert the default disk format to qcow2 for users running macOS 10.13 (High Sierra). There are confirmed reports of file corruption using the raw format which uses sparse files on APFS. Note this change only takes effect after a reset to factory defaults (from the Whale menu -> Preferences -> Reset). Related to [docker/for-mac#2625](https://github.com/docker/for-mac/issues/2625)
|
||||
|
@ -674,7 +676,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/21805/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/21805/Docker.dmg){: .accept-eula }
|
||||
|
||||
* Bug fixes and minor changes
|
||||
- Fix error during resize/create Docker.raw disk image in some cases. Fixes [docker/for-mac#2383](https://github.com/docker/for-mac/issues/2383), [docker/for-mac#2447](https://github.com/docker/for-mac/issues/2447), [docker/for-mac#2453], (https://github.com/docker/for-mac/issues/2453), [docker/for-mac#2420](https://github.com/docker/for-mac/issues/2420)
|
||||
|
@ -691,7 +693,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/21698/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/21698/Docker.dmg){: .accept-eula }
|
||||
|
||||
* Bug fixes and minor changes
|
||||
- Fix for `docker push` to an insecure registry. Fixes [docker/for-mac#2392](https://github.com/docker/for-mac/issues/2392)
|
||||
|
@ -703,7 +705,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/21698/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/21698/Docker.dmg){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 17.12.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.12.0-ce)
|
||||
|
@ -734,7 +736,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/21090/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/21090/Docker.dmg){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 17.09.1-ce](https://github.com/docker/docker-ce/releases/tag/v17.09.1-ce)
|
||||
|
@ -750,7 +752,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://download.docker.com/mac/stable/19611/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://download.docker.com/mac/stable/19611/Docker.dmg){: .accept-eula }
|
||||
|
||||
* Bug fix
|
||||
- Fix Docker For Mac unable to start in some cases : removed use of libgmp sometimes causing the vpnkit process to die.
|
||||
|
|
|
@ -17,10 +17,8 @@ This page contains information about the new features, improvements, known issue
|
|||
|
||||
> Download Docker Desktop
|
||||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [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 }
|
||||
> [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 }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -57,8 +55,8 @@ This page contains information about the new features, improvements, known issue
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66501/Docker.dmg){: .accept-eula } |
|
||||
> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66501/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66501/Docker.dmg){: .accept-eula } |
|
||||
> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66501/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -92,8 +90,8 @@ This page contains information about the new features, improvements, known issue
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66090/Docker.dmg){: .accept-eula } |
|
||||
> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66090/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66090/Docker.dmg){: .accept-eula } |
|
||||
> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66090/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -112,8 +110,8 @@ This page contains information about the new features, improvements, known issue
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66024/Docker.dmg){: .accept-eula } |
|
||||
> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66024/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/66024/Docker.dmg){: .accept-eula } |
|
||||
> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/66024/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -151,8 +149,8 @@ This page contains information about the new features, improvements, known issue
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/65384/Docker.dmg){: .accept-eula } |
|
||||
> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/65384/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/65384/Docker.dmg){: .accept-eula } |
|
||||
> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/65384/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -204,8 +202,8 @@ This page contains information about the new features, improvements, known issue
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/64133/Docker.dmg){: .accept-eula } |
|
||||
> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/64133/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/64133/Docker.dmg){: .accept-eula } |
|
||||
> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/64133/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -223,8 +221,8 @@ This page contains information about the new features, improvements, known issue
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/63878/Docker.dmg){: .accept-eula } |
|
||||
> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/63878/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/63878/Docker.dmg){: .accept-eula } |
|
||||
> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/63878/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -252,8 +250,8 @@ This page contains information about the new features, improvements, known issue
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/63152/Docker.dmg){: .accept-eula } |
|
||||
> [Download for Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/63152/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/63152/Docker.dmg){: .accept-eula } |
|
||||
> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/63152/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -280,13 +278,13 @@ Docker Desktop is now available for Apple silicon as well as Intel chips. This e
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/62916/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/62916/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
You can now specify when to download and install a Docker Desktop update. When an update becomes available, Docker Desktop displays an icon to indicate the availability of a newer version. You can download the update in the background whenever convenient. When the download is complete, all you need to do is to click Update and restart to install the latest update.
|
||||
|
||||
Developers who use Docker Desktop for professional development purposes may at times need to skip a specific update. For this reason, Pro or Team subscription developers can skip notifications for a particular update when a reminder appears.
|
||||
Developers who use Docker Desktop for professional development purposes may at times need to skip a specific update. For this reason, users with a paid Docker subscription can skip notifications for a particular update when a reminder appears.
|
||||
|
||||
For developers in IT managed environments, who don’t have administrative access to install updates to Docker Desktop, there is now an option in the Settings menu to opt out of notifications altogether for Docker Desktop updates if your Docker ID is part of a Team subscription.
|
||||
|
||||
|
@ -322,7 +320,7 @@ For developers in IT managed environments, who don’t have administrative acces
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/61853/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/61853/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
||||
|
@ -338,7 +336,7 @@ For developers in IT managed environments, who don’t have administrative acces
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/61626/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/61626/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -355,7 +353,7 @@ For developers in IT managed environments, who don’t have administrative acces
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/61504/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/61504/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -403,7 +401,7 @@ Docker Desktop can sometimes fail to start after updating to version 3.2.0. If y
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/51484/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/51484/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -426,7 +424,7 @@ Docker Desktop can sometimes fail to start after updating to version 3.2.0. If y
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/51218/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/51218/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -448,7 +446,7 @@ Docker Desktop can sometimes fail to start after updating to version 3.2.0. If y
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/51017/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/51017/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
||||
|
@ -466,7 +464,7 @@ Docker Desktop can sometimes fail to start after updating to version 3.2.0. If y
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/50996/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/50996/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
||||
|
@ -486,7 +484,7 @@ Docker Desktop can sometimes fail to start after updating to version 3.2.0. If y
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/50773/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/50773/Docker.dmg){: .accept-eula }
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
||||
|
@ -505,7 +503,7 @@ Docker Desktop can sometimes fail to start after updating to version 3.2.0. If y
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download for Mac with Intel chip](https://desktop.docker.com/mac/stable/50684/Docker.dmg){: .accept-eula }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/50684/Docker.dmg){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ toc_max: 2
|
|||
target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_desktop_support"
|
||||
%}
|
||||
|
||||
This page contains information on how to diagnose and troubleshoot Docker Desktop issues, request Docker Desktop support (Pro and Team plan users only), send logs and communicate with the Docker Desktop team, use our forums and Success Center, browse and log issues on GitHub, and find workarounds for known problems.
|
||||
This page contains information on how to diagnose and troubleshoot Docker Desktop issues, request Docker Desktop support, send logs and communicate with the Docker Desktop team, use our forums and Success Center, browse and log issues on GitHub, and find workarounds for known problems.
|
||||
|
||||
## Troubleshoot
|
||||
|
||||
|
@ -26,7 +26,7 @@ The Troubleshoot page contains the following options:
|
|||
|
||||
* **Restart Docker Desktop**: Select to restart Docker Desktop.
|
||||
|
||||
* **Support**: Developers on Pro and Team plans can use this option to send a support request. Other users can use this option to diagnose any issues in Docker Desktop. For more information, see [Diagnose and feedback](#diagnose-and-feedback) and [Support](#support).
|
||||
* **Support**: Users with a paid Docker subscription can use this option to send a support request. Other users can use this option to diagnose any issues in Docker Desktop. For more information, see [Diagnose and feedback](#diagnose-and-feedback) and [Support](#support).
|
||||
|
||||
* **Reset Kubernetes cluster**: Select this option to delete all stacks and Kubernetes resources. For more information, see [Kubernetes](index.md#kubernetes).
|
||||
|
||||
|
@ -65,7 +65,7 @@ the log data. Before reporting an issue, we recommend that you read the informat
|
|||
|
||||
> **Note**
|
||||
>
|
||||
> Docker Desktop offers support for users subscribed to a Pro or a Team plan. If you are experiencing any issues with Docker Desktop, follow the instructions in this section to send a support request to Docker Support.
|
||||
> Docker Desktop offers support for users with a paid Docker subscription. If you are experiencing any issues with Docker Desktop, follow the instructions in this section to send a support request to Docker Support.
|
||||
|
||||
Before you get started, we recommend that you sign into your Docker Desktop application and your [Docker Hub](https://hub.docker.com/){:target="_blank" rel="noopener" class="_"} account.
|
||||
|
||||
|
@ -75,11 +75,11 @@ Before you get started, we recommend that you sign into your Docker Desktop appl
|
|||
{:width="600px"}
|
||||
4. When the diagnostics collection process is complete, click **Upload to get a Diagnostic ID**.
|
||||
5. When the diagnostics have been uploaded, Docker Desktop prints a diagnostic ID. Copy this ID.
|
||||
6. If you have subscribed to a Pro or a Team plan, click **Contact Support**. This opens the [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"} form. Fill in the information required and add the ID you copied earlier to the Diagnostics ID field. Click **Submit** to request Docker Desktop support.
|
||||
6. If you have a paid Docker subscription, click **Contact Support**. This opens the [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"} form. Fill in the information required and add the ID you copied earlier to the Diagnostics ID field. Click **Submit** to request Docker Desktop support.
|
||||
> **Note**
|
||||
>
|
||||
> You must be signed in to Docker Desktop using your Pro or Team plan credentials to access the support form. For information on what's covered as part of Docker Desktop support, see [Support](#support).
|
||||
7. If you are not subscribed to a Pro or a team plan, you can click **Upgrade to benefit from Docker Support** to upgrade your existing account.
|
||||
> You must be signed in to Docker Desktop using your Pro, Team, or Business tier credentials to access the support form. For information on what's covered as part of Docker Desktop support, see [Support](#support).
|
||||
7. If you don't have a paid Docker subscription, you can click **Upgrade to benefit from Docker Support** to upgrade your existing account.
|
||||
Alternatively, click **Report a Bug** to open a new Docker Desktop issue on GitHub. This opens Docker Desktop [for Mac](https://github.com/docker/for-mac/issues/) on GitHub in your web browser in a 'New issue' template. Complete the information required and ensure you add the diagnostic ID you copied earlier. Click **submit new issue** to create a new issue.
|
||||
|
||||
### Diagnosing from the terminal
|
||||
|
@ -366,13 +366,13 @@ This section contains instructions on how to get support, and covers the scope o
|
|||
|
||||
### How do I get Docker Desktop support?
|
||||
|
||||
If you have subscribed to a Pro and Team account, please raise a ticket through [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"}.
|
||||
If you have a paid Docker subscription, please raise a ticket through [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"}.
|
||||
|
||||
Docker Community users can get support through our Github repos for-win and for-mac, where we respond on a best-effort basis.
|
||||
|
||||
### What support can I get?
|
||||
|
||||
If you are a Pro or a Team user, you can request for support on the following types of issues:
|
||||
If you have a paid Docker subscription, you can request for support on the following types of issues:
|
||||
|
||||
* Desktop upgrade issues
|
||||
* Desktop installation issues
|
||||
|
|
|
@ -957,7 +957,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
|
||||
|
|
|
@ -16,9 +16,7 @@ Welcome to Docker Desktop for Windows. This page contains information about Dock
|
|||
|
||||
> Download Docker Desktop for Windows
|
||||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Docker Desktop for Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe){: .button .primary-btn .accept-eula }
|
||||
> [Docker Desktop for Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe){: .button .primary-btn }
|
||||
|
||||
## System requirements
|
||||
|
||||
|
@ -123,34 +121,18 @@ Docker Desktop does not start automatically after installation. To start Docker
|
|||
|
||||
{:width="300px"}
|
||||
|
||||
The Docker menu ({: .inline}) displays the Docker Subscription Service Agreement window. It includes a change to the terms of use for Docker Desktop.
|
||||
|
||||
The Docker menu ({: .inline}) displays the Subscription Service Terms window. It includes a change to the terms of use for Docker Desktop.
|
||||
{% include desktop-license-update.md %}
|
||||
|
||||
> **Docker Subscription Service Terms**
|
||||
>
|
||||
> Beginning on August 31, 2021, you must agree to the [Docker Subscription Service Terms](https://www.docker.com/legal/docker-terms-service){: target="_blank" rel="noopener" class="_"} to continue using Docker Desktop. Read the information presented on the screen to understand how the changes impact you.
|
||||
|
||||
{:width="700px"}
|
||||
|
||||
**Here’s a summary of the key changes:**
|
||||
|
||||
- Docker Subscription Service Terms include a change to the terms of use for Docker Desktop
|
||||
- It remains free for small businesses (fewer than 250 employees AND less than $1 million in revenue), personal use, education, and non-commercial open source projects.
|
||||
- It requires a paid subscription for professional use in larger enterprises.
|
||||
- The effective date of these terms is 31 August 2021. There is a grace period until 31 January 2022 for those that will require a paid subscription to use Docker Desktop.
|
||||
- The existing Docker Free subscription has been renamed Docker Personal and we have introduced a Docker Business subscription .
|
||||
The Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop.
|
||||
|
||||
The [blog post](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} and the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}also give you detailed information about the changes.
|
||||
|
||||
Click the checkbox to indicate that you accept the terms of service and then click **Accept** to continue. Docker Desktop starts after you accept the terms of service.
|
||||
Click the checkbox to indicate that you accept the updated terms and then click **Accept** to continue. Docker Desktop starts after you accept the terms.
|
||||
|
||||
> **Important**
|
||||
>
|
||||
> If you do not agree to the terms of service, the Docker Desktop application will close and you can no longer run Docker Desktop on your machine. You can choose to accept the terms at a later date by opening Docker Desktop.
|
||||
> If you do not agree to the updated 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}
|
||||
|
||||
For more information, see [Docker Desktop license terms](/subscription/#docker-desktop-license-terms).
|
||||
For more information, see [Docker Desktop License Agreement](/subscription/#docker-desktop-license-agreement).
|
||||
|
||||
### Quick Start Guide
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ This page contains release notes for older versions of Docker Desktop for Window
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/49550/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/49550/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -31,14 +31,14 @@ This page contains release notes for older versions of Docker Desktop for Window
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/49427/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/49427/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
Docker Desktop 2.5.0.0 contains a Kubernetes upgrade. Your local Kubernetes cluster will be reset after installing this version.
|
||||
|
||||
### New
|
||||
|
||||
- Users subscribed to a Pro or a Team plan can now see the vulnerability scan report on the Remote repositories tab in Docker Desktop.
|
||||
- Docker Desktop introduces a support option for users who have subscribed to a Pro or a Team Plan.
|
||||
- Users with a paid Docker subscription can now see the vulnerability scan report on the Remote repositories tab in Docker Desktop.
|
||||
- Docker Desktop introduces a support option for users who have a paid Docker subscription.
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -73,7 +73,7 @@ Docker Desktop 2.5.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/48506/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/48506/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes cluster will be reset after installing this version.
|
||||
|
||||
|
@ -147,7 +147,7 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/48029/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/48029/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -175,7 +175,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/46911/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/46911/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -200,7 +200,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/45519/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/45519/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -227,7 +227,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/45183/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/45183/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -300,7 +300,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/43884/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/43884/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
||||
|
@ -317,7 +317,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/43472/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/43472/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -352,7 +352,7 @@ the `--privileged` flag. See [docker/for-win#8326](https://github.com/docker/for
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/42716/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/42716/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -458,7 +458,7 @@ For detailed information about the new Dashboard UI, see [Docker Desktop Dashboa
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/40693/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/40693/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
Docker Desktop 2.1.0.5 contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing this version.
|
||||
|
||||
|
@ -475,7 +475,7 @@ Docker Desktop 2.1.0.5 contains a Kubernetes upgrade. Note that your local Kuber
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/39773/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/39773/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
Docker Desktop 2.1.0.4 contains a Kubernetes upgrade. Note that your local Kubernetes cluster will be reset after installing this version.
|
||||
|
||||
|
@ -497,7 +497,7 @@ Docker Desktop now enables you to sign into Docker Hub using two-factor authenti
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/38240/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/38240/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -510,7 +510,7 @@ Docker Desktop now enables you to sign into Docker Hub using two-factor authenti
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/37877/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/37877/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
Docker Desktop 2.1.0.2 contains a Kubernetes upgrade. Your local Kubernetes cluster will be reset after installing this version.
|
||||
|
||||
|
@ -528,7 +528,7 @@ Docker Desktop 2.1.0.2 contains a Kubernetes upgrade. Your local Kubernetes clus
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/37199/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/37199/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
Note that you must sign in and create a Docker ID in order to download Docker Desktop.
|
||||
|
||||
|
@ -599,7 +599,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/31259/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/31259/Docker%20for%20Windows%20Installer.exe){: .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)
|
||||
|
@ -613,7 +613,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/30215/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/30215/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 18.09.1](https://github.com/docker/docker-ce/releases/tag/v18.09.1)
|
||||
|
@ -635,7 +635,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/29211/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/29211/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker compose 1.23.2](https://github.com/docker/compose/releases/tag/1.23.2)
|
||||
|
@ -649,7 +649,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/28905/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/28905/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 18.09.0](https://github.com/docker/docker-ce-packaging/releases/tag/v18.09.0)
|
||||
|
@ -682,7 +682,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/19507/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/19507/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 18.06.1-ce](https://github.com/docker/docker-ce/releases/tag/v18.06.1-ce)
|
||||
|
@ -704,10 +704,10 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/19098/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/19098/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
* New
|
||||
- Renewed signing certificate. The installer may show a Windows Defender popup until the renewed certificate is whitelisted. Click "More info" to view the app is published by "Docker Inc" and run it.
|
||||
- Renewed signing certificate. The installer may show a Windows Defender popup until the renewed certificate is allowlisted. Click "More info" to view the app is published by "Docker Inc" and run it.
|
||||
|
||||
* Bug fixes and minor changes
|
||||
- Fix bug in automatic feature enabling if "Hyper-V" and "Containers" Windows features are not enabled already when starting Docker Desktop.
|
||||
|
@ -718,7 +718,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/19075/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/19075/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 18.06.0-ce](https://github.com/docker/docker-ce/releases/tag/v18.06.0-ce)
|
||||
|
@ -747,7 +747,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/17513/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/17513/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 18.03.1-ce](https://github.com/docker/docker-ce/releases/tag/v18.03.1-ce)
|
||||
|
@ -764,7 +764,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/17438/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/17438/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 18.03.1-ce](https://github.com/docker/docker-ce/releases/tag/v18.03.1-ce)
|
||||
|
@ -781,7 +781,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/16762/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/16762/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 18.03.0-ce](https://github.com/docker/docker-ce/releases/tag/v18.03.0-ce)
|
||||
|
@ -817,7 +817,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/15139/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/15139/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
* Bug fixes and minor changes
|
||||
- Fix linuxkit port-forwarder sometimes not being able to start. Fixes [docker/for-win#1506](https://github.com/docker/for-win/issues/1506)
|
||||
|
@ -831,7 +831,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/15048/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/15048/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 17.12.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.12.0-ce)
|
||||
|
@ -859,7 +859,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/14687/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/14687/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 17.09.1-ce](https://github.com/docker/docker-ce/releases/tag/v17.09.1-ce)
|
||||
|
@ -880,7 +880,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/13620/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/13620/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
* Bug fixes
|
||||
- Fix Docker For Windows unable to start in some cases: removed use of libgmp sometimes causing the vpnkit process to die.
|
||||
|
@ -891,7 +891,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/13529/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/13529/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 17.09.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.09.0-ce)
|
||||
|
@ -934,7 +934,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/13194/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/13194/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
* Upgrades
|
||||
- [Docker 17.06.2-ce](https://github.com/docker/docker-ce/releases/tag/v17.06.2-ce)
|
||||
|
@ -946,7 +946,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/13025/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/13025/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
**Upgrades**
|
||||
|
||||
|
@ -965,7 +965,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/12627/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/12627/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
**Upgrades**
|
||||
|
||||
|
@ -1009,7 +1009,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/12058/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/12058/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
**Upgrades**
|
||||
|
||||
|
@ -1021,7 +1021,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features:
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/10743/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/10743/Docker%20for%20Windows%20Installer.exe){: .accept-eula }
|
||||
|
||||
**New**
|
||||
|
||||
|
@ -1060,7 +1060,7 @@ progressively
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/1.13.1.10072/InstallDocker.msi){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/1.13.1.10072/InstallDocker.msi){: .accept-eula }
|
||||
|
||||
**Upgrades**
|
||||
|
||||
|
@ -1081,7 +1081,7 @@ progressively
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/1.13.0.9795/InstallDocker.msi){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/1.13.0.9795/InstallDocker.msi){: .accept-eula }
|
||||
|
||||
**Upgrades**
|
||||
|
||||
|
@ -1128,7 +1128,7 @@ progressively
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/1.12.5.9503/InstallDocker.msi){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/1.12.5.9503/InstallDocker.msi){: .accept-eula }
|
||||
|
||||
**Upgrades**
|
||||
|
||||
|
@ -1145,7 +1145,7 @@ We did not distribute a 1.12.4 stable release
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/1.12.3.8488/InstallDocker.msi){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/1.12.3.8488/InstallDocker.msi){: .accept-eula }
|
||||
|
||||
**New**
|
||||
|
||||
|
@ -1232,7 +1232,7 @@ We did not distribute a 1.12.4 stable release
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/1.12.1.7135/InstallDocker.msi){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/1.12.1.7135/InstallDocker.msi){: .accept-eula }
|
||||
|
||||
>**Important Note**:
|
||||
>
|
||||
|
@ -1331,7 +1331,7 @@ We did not distribute a 1.12.4 stable release
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://download.docker.com/win/stable/1.12.0.5968/InstallDocker.msi){: .accept-eula }
|
||||
> [For Windows](https://download.docker.com/win/stable/1.12.0.5968/InstallDocker.msi){: .accept-eula }
|
||||
|
||||
* First stable release
|
||||
|
||||
|
|
|
@ -17,9 +17,7 @@ This page contains information about the new features, improvements, known issue
|
|||
|
||||
> Download Docker Desktop
|
||||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](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 }
|
||||
> [For 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 }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -63,7 +61,7 @@ This page contains information about the new features, improvements, known issue
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/amd64/66501/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/amd64/66501/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -98,7 +96,7 @@ This page contains information about the new features, improvements, known issue
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/amd64/66090/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/amd64/66090/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -118,7 +116,7 @@ This page contains information about the new features, improvements, known issue
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/amd64/66024/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/amd64/66024/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -156,7 +154,7 @@ This page contains information about the new features, improvements, known issue
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/amd64/65384/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/amd64/65384/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -199,7 +197,7 @@ This page contains information about the new features, improvements, known issue
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/amd64/64133/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/amd64/64133/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -217,7 +215,7 @@ This page contains information about the new features, improvements, known issue
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/amd64/63878/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/amd64/63878/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -241,7 +239,7 @@ This page contains information about the new features, improvements, known issue
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/amd64/63152/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/amd64/63152/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
||||
|
@ -257,13 +255,13 @@ This page contains information about the new features, improvements, known issue
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/amd64/62916/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/amd64/62916/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
You can now specify when to download and install a Docker Desktop update. When an update becomes available, Docker Desktop displays an icon to indicate the availability of a newer version. You can download the update in the background whenever convenient. When the download is complete, all you need to do is to click Update and restart to install the latest update.
|
||||
|
||||
Developers who use Docker Desktop for professional development purposes may at times need to skip a specific update. For this reason, Pro or Team subscription developers can skip notifications for a particular update when a reminder appears.
|
||||
Developers who use Docker Desktop for professional development purposes may at times need to skip a specific update. For this reason, users with a paid Docker subscription can skip notifications for a particular update when a reminder appears.
|
||||
|
||||
For developers in IT managed environments, who don’t have administrative access to install updates to Docker Desktop, there is now an option in the Settings menu to opt out of notifications altogether for Docker Desktop updates if your Docker ID is part of a Team subscription.
|
||||
|
||||
|
@ -293,7 +291,7 @@ For developers in IT managed environments, who don’t have administrative acces
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/amd64/61853/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/amd64/61853/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
||||
|
@ -308,7 +306,7 @@ For developers in IT managed environments, who don’t have administrative acces
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/amd64/61626/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/amd64/61626/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -321,7 +319,7 @@ For developers in IT managed environments, who don’t have administrative acces
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/amd64/61504/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/amd64/61504/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -370,7 +368,7 @@ For developers in IT managed environments, who don’t have administrative acces
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/51484/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/51484/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
@ -394,7 +392,7 @@ For developers in IT managed environments, who don’t have administrative acces
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/51218/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/51218/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
@ -411,7 +409,7 @@ For developers in IT managed environments, who don’t have administrative acces
|
|||
>
|
||||
> {%- include eula.md -%}
|
||||
>
|
||||
> [Download](https://desktop.docker.com/win/stable/50684/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
> [For Windows](https://desktop.docker.com/win/stable/50684/Docker%20Desktop%20Installer.exe){: .accept-eula }
|
||||
|
||||
### New
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ toc_max: 2
|
|||
target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_desktop_support"
|
||||
%}
|
||||
|
||||
This page contains information on how to diagnose and troubleshoot Docker Desktop issues, request Docker Desktop support (Pro and Team plan users only), send logs and communicate with the Docker Desktop team, use our forums and Success Center, browse and log issues on GitHub, and find workarounds for known problems.
|
||||
This page contains information on how to diagnose and troubleshoot Docker Desktop issues, request Docker Desktop support, send logs and communicate with the Docker Desktop team, use our forums and Success Center, browse and log issues on GitHub, and find workarounds for known problems.
|
||||
|
||||
## Troubleshoot
|
||||
|
||||
|
@ -27,7 +27,7 @@ The Troubleshoot page contains the following options:
|
|||
|
||||
* **Restart Docker Desktop**: Select to restart Docker Desktop.
|
||||
|
||||
* **Support**: Developers on Pro and Team plans can use this option to send a support request. Other users can use this option to diagnose any issues in Docker Desktop. For more information, see [Diagnose and feedback](#diagnose-and-feedback) and [Support](#support).
|
||||
* **Support**: Users with a paid Docker subscription can use this option to send a support request. Other users can use this option to diagnose any issues in Docker Desktop. For more information, see [Diagnose and feedback](#diagnose-and-feedback) and [Support](#support).
|
||||
|
||||
* **Reset Kubernetes cluster**: Select this option to delete all stacks and Kubernetes resources. For more information, see [Kubernetes](index.md#kubernetes).
|
||||
|
||||
|
@ -53,12 +53,12 @@ from the menu.
|
|||
{:width="600px"}
|
||||
4. When the diagnostics collection process is complete, click **Upload to get a Diagnostic ID**.
|
||||
5. When the diagnostics have been uploaded, Docker Desktop prints a Diagnostic ID. Copy this ID.
|
||||
6. If you have subscribed to a Pro or a Team plan, click **Contact Support**. This opens the [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"} form. Fill in the information required and add the ID you copied earlier to the Diagnostics ID field. Click **Submit** to request Docker Desktop support.
|
||||
6. If you have a paid Docker subscription, click **Contact Support**. This opens the [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"} form. Fill in the information required and add the ID you copied earlier to the Diagnostics ID field. Click **Submit** to request Docker Desktop support.
|
||||
|
||||
> **Note**
|
||||
>
|
||||
> You must be signed in to Docker Desktop using your Pro or Team plan credentials to access the support form. For information on what's covered as part of Docker Desktop support, see [Support](#support).
|
||||
7. If you are not subscribed to a Pro or a team plan, you can click **Upgrade to benefit from Docker Support** to upgrade your existing account.
|
||||
7. If you don't have a paid Docker subscription, click **Upgrade to benefit from Docker Support** to upgrade your existing account.
|
||||
Alternatively, click **Report a Bug** to open a new Docker Desktop issue on GitHub. This opens Docker Desktop [for Windows](https://github.com/docker/for-win/issues/) on GitHub in your web browser in a 'New issue' template. Complete the information required and ensure you add the diagnostic ID you copied earlier. Click **submit new issue** to create a new issue.
|
||||
|
||||
### Diagnosing from the terminal
|
||||
|
@ -449,13 +449,13 @@ This section contains instructions on how to get support, and covers the scope o
|
|||
|
||||
### How do I get Docker Desktop support?
|
||||
|
||||
If you have subscribed to a Pro and Team account, please raise a ticket through [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"}.
|
||||
If you have a paid Docker subscription, please raise a ticket through [Docker Desktop support](https://hub.docker.com/support/desktop/){:target="_blank" rel="noopener" class="_"}.
|
||||
|
||||
Docker Community users can get support through our Github repos for-win and for-mac, where we respond on a best-effort basis.
|
||||
|
||||
### What support can I get?
|
||||
|
||||
If you are a Pro or a Team user, you can request for support on the following types of issues:
|
||||
If you have a paid Docker subscription, you can request for support on the following types of issues:
|
||||
|
||||
* Desktop upgrade issues
|
||||
* Desktop installation issues
|
||||
|
|
|
@ -5,8 +5,8 @@ keywords: docker scan, scan, images, snyk, vulnerability
|
|||
---
|
||||
|
||||
{% include upgrade-cta.html
|
||||
body="Did you know that Docker subscribers receive 200 Snyk vulnerability scans as part of their subscription? Click [here](https://snyk.co/udvnv) to activate your free monthly scans. Upgrade your existing plan to start scanning your images for vulnerabilities."
|
||||
header-text="This feature requires a Pro or a Team plan"
|
||||
body="Did you know that Docker subscribers receive 200 Snyk vulnerability scans as part of their subscription? Click [here](https://snyk.co/udvnv) to activate your free monthly scans. Upgrade your existing subscription to start scanning your images for vulnerabilities."
|
||||
header-text="This feature requires a paid Docker subscription"
|
||||
target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_scan"
|
||||
%}
|
||||
|
||||
|
@ -39,7 +39,7 @@ You can trigger scans, view, and inspect vulnerabilities through Docker Hub. For
|
|||
|
||||
> **Note**
|
||||
>
|
||||
> Docker Hub Vulnerability Scanning is available for developers subscribed to a Pro or a Team plan. For more information about the pricing plans, see [Docker Pricing](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){:target="_blank" rel="noopener" class="_"}.
|
||||
> Docker Hub Vulnerability Scanning is available for developers subscribed to a Docker Pro, Team, or a Business tier. For more information about the pricing plans, see [Docker Pricing](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){:target="_blank" rel="noopener" class="_"}.
|
||||
|
||||
{:width="700px"}
|
||||
|
||||
|
|
|
@ -44,14 +44,14 @@ the token will be used, or set a purpose for the token.
|
|||
|
||||
5. You can view the following permissions from the drop-down:
|
||||
|
||||
| Features | Free | Pro | Team |
|
||||
| --------------------- | ---- | ----- | ----- |
|
||||
| Personal Access Tokens (read, write, delete scope only)* | x | x | x |
|
||||
| Scoped Personal Access Tokens | | x | x |
|
||||
| Unlimited Personal Access Tokens | | | x |
|
||||
| Feature | Personal | Pro | Team | Business |
|
||||
| --------------------- | ---- | ----- | ----- |----- |
|
||||
| Personal Access Tokens (read, write, delete scope only)* | x | x | x | x |
|
||||
| Scoped Personal Access Tokens | | x | x | x |
|
||||
| Unlimited Personal Access Tokens | | | x | x |
|
||||
|
||||
>*You can create 1 access token as part of the Free plan, 5 tokens per the Pro plan, and Unlimited tokens for the Team plan.
|
||||
For more information about a Pro or a Team plan, see [Docker Pricing](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"}.
|
||||
>*You can create 1 access token as part of the Docker Personal tier, 5 tokens as part of Docker Pro, and Unlimited tokens as part of Docker Team and Business tier.
|
||||
For more information, see [Docker Pricing](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"}.
|
||||
|
||||
6. Copy the token that appears on the screen and save it. You will not be able to retrieve the token once you close this prompt.
|
||||
|
||||
|
|
|
@ -42,14 +42,14 @@ pushing to the registry. You can use these tests to create a continuous
|
|||
integration workflow where a build that fails its tests does not push the built
|
||||
image. Automated tests do not push images to the registry on their own. [Learn more about automated image testing here.](automated-testing.md)
|
||||
|
||||
Depending on your [plan](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}, you may get parallel builds, which means that `N`
|
||||
Depending on your [plan](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}, you may get concurrent builds, which means that `N`
|
||||
autobuilds can be run at the same time. `N` is configured by the plan that you
|
||||
subscribe to. Once `N+1` builds are running, any additional builds are
|
||||
queued to be run later.
|
||||
|
||||
> **Note**
|
||||
>
|
||||
> The total number of pending builds in the queue is limited to 30 and further requests will be discarded. The number of parallel builds for Pro is 5 and for Team is 15.
|
||||
> The total number of pending builds in the queue is limited to 30 and further requests will be discarded. The number of concurrent builds for Pro is 5 and for Team is 15.
|
||||
|
||||

|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -40,11 +40,11 @@ Before you convert a user account to an organization, ensure that you have compl
|
|||
|
||||
Your Community account has now been converted to an organization.
|
||||
|
||||
## Convert a Pro account into an organization
|
||||
## Convert a Docker Pro tier into an organization
|
||||
|
||||
>**Note:**
|
||||
>
|
||||
> When you convert a Pro or a legacy individual repository plan to an organization, the account
|
||||
> When you convert a Docker Pro subscription to an organization, the account
|
||||
will be migrated to a Team plan and will be charged $35 per month for 5 seats. For more information,
|
||||
see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}.
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ Before deactivating your Docker Hub account, please complete the following:
|
|||
1. Download any images and tags you want to keep:
|
||||
`docker pull -a <image>:<tag>`.
|
||||
|
||||
3. If you have an active subscription, downgrade it to the **free** plan.
|
||||
3. If you have an active subscription, downgrade it to the **Docker Personal** subscription.
|
||||
|
||||
In Docker Hub, navigate to **_Your Account_** > **Account Settings** > **Billing**.
|
||||
|
||||
|
@ -40,7 +40,7 @@ Before deactivating an organization, please complete the following:
|
|||
1. Download any images and tags you want to keep:
|
||||
`docker pull -a <image>:<tag>`.
|
||||
|
||||
2. If you have an active subscription, downgrade it to the **free** plan:
|
||||
2. If you have an active subscription, downgrade it to the **Docker Personal** subscription:
|
||||
|
||||
In Docker Hub, navigate to **Organizations** > **_Your Organization_** > **Billing**.
|
||||
|
||||
|
|
|
@ -87,11 +87,11 @@ This means my limit is 100 per 21600 seconds (6 hours), and I have 76 pulls rema
|
|||
|
||||
If you do not see these headers, that means pulling that image would not count towards pull limits. This could be because you are authenticated with a user associated with a Pro/Team Docker Hub account, or because the image or your IP is unlimited in partnership with a publisher, provider, or an open-source organization.
|
||||
|
||||
## I'm being limited even though I have a Pro/Team account
|
||||
## I'm being limited even though I have a paid Docker subscription
|
||||
|
||||
To take advantage of the higher limits included in these plans, you must [authenticate pulls](#how-do-i-authenticate-pull-requests) with your user account.
|
||||
To take advantage of the higher limits included in a paid Docker subscription, you must [authenticate pulls](#how-do-i-authenticate-pull-requests) with your user account.
|
||||
|
||||
A Pro/Team plan does not increase limits on your images for other users. See our [Open Source](https://www.docker.com/blog/expanded-support-for-open-source-software-projects/){: target="_blank" rel="noopener" class="_"}, [Publisher](https://www.docker.com/partners/programs){: target="_blank" rel="noopener" class="_"}, or [Large Organization](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"} offerings.
|
||||
A Pro, Team, or a Business tier does not increase limits on your images for other users. See our [Open Source](https://www.docker.com/blog/expanded-support-for-open-source-software-projects/){: target="_blank" rel="noopener" class="_"}, [Publisher](https://www.docker.com/partners/programs){: target="_blank" rel="noopener" class="_"}, or [Large Organization](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"} offerings.
|
||||
|
||||
## How do I authenticate pull requests
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ title: Advanced Image Management dashboard
|
|||
target-url="https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade_image-mgmt"
|
||||
%}
|
||||
|
||||
The **Advanced Image Management** dashboard allows you to manage Docker images across all repositories. [Upgrade](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"} your existing account to a Pro or a Team account to start using the Advanced Image Management dashboard.
|
||||
The **Advanced Image Management** dashboard allows you to manage Docker images across all repositories. [Upgrade](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"} your existing subscription to start using the Advanced Image Management dashboard.
|
||||
|
||||
The Advanced Image Management dashboard provides a snapshot of your existing images and allows you to view, sort, and filter images by tags, activity status, and date, and contains options to clean up your workspace by deleting images that are no longer required.
|
||||
|
||||
|
@ -28,7 +28,7 @@ To access the Advanced Image Management dashboard:
|
|||
2. Click **Repositories** from the main menu and select a repository from the list. This displays a banner indicating the number of inactive images in the repository.
|
||||
3. Click **View inactive images**. This displays the Advanced Image Management dashboard. It lists images in your repository and allows you to sort and filter images by tags, activity status, and the last activity date.
|
||||
|
||||
> You must be logged in as a Pro or a Team user to use the Advanced Image Management dashboard. Click [Upgrade](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"} to upgrade your existing subscription.
|
||||
> You must be logged in as a Docker Pro, Team, or a Business user to use the Advanced Image Management dashboard. Click [Upgrade](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"} to upgrade your existing subscription.
|
||||
|
||||
## View images
|
||||
|
||||
|
@ -38,7 +38,7 @@ The Advanced Image Management dashboard provides a snapshot of your existing ima
|
|||
|
||||
## Delete images
|
||||
|
||||
> You must be logged in as a Pro or a Team user and have admin access to the repository to delete images.
|
||||
> You must be logged in as a Docker Pro, Team, or a Business user and have admin access to the repository to delete images.
|
||||
|
||||
By default, the Advanced Image Management dashboard displays inactive images in the repository. To delete an inactive image:
|
||||
|
||||
|
|
|
@ -170,5 +170,5 @@ Congratulations! You've successfully:
|
|||
- Create an [organization](orgs.md) to use Docker Hub with your team.
|
||||
- Automatically build container images from code through [builds](builds/index.md).
|
||||
- [Explore](https://hub.docker.com/explore) official & publisher images.
|
||||
- [Upgrade your plan](https://www.docker.com/pricing) to push additional private Docker images to
|
||||
- [Upgrade your subscription](https://www.docker.com/pricing) to push additional private Docker images to
|
||||
Docker Hub.
|
||||
|
|
|
@ -67,7 +67,7 @@ Docker introduces Hub Vulnerability Scanning which enables you to automatically
|
|||
|
||||
### New features
|
||||
|
||||
* Docker has announced a new, per-seat pricing model to accelerate developer workflows for cloud-native development. The previous private repository/parallel autobuild-based plans have been replaced with new **Pro** and **Team** plans that include unlimited private repositories. For more information, see [Docker subscription](../subscription/index.md).
|
||||
* Docker has announced a new, per-seat pricing model to accelerate developer workflows for cloud-native development. The previous private repository/concurrent autobuild-based plans have been replaced with new **Pro** and **Team** plans that include unlimited private repositories. For more information, see [Docker subscription](../subscription/index.md).
|
||||
|
||||
* Docker has enabled download rate limits for downloads and pull requests on Docker Hub. This caps the number of objects that users can download within a specified timeframe. For more information, see [Download rate limit](download-rate-limit.md).
|
||||
|
||||
|
|
|
@ -16,9 +16,9 @@ When you push an image to Docker Hub after enabling vulnerability scanning, Dock
|
|||
|
||||
## Scan images
|
||||
|
||||
Hub Vulnerability scanning allows repository owners and administrators of a Pro or a Team plan to enable and disable scanning.
|
||||
Hub Vulnerability scanning allows repository owners and administrators of a Docker Pro, Team, or a Business tier to enable and disable scanning.
|
||||
|
||||
In addition, repository owners in a Pro plan and team members in a Team plan can view the detailed scan reports. When scanning is enabled on a specific repository, anyone with push access can trigger a scan by pushing an image to Docker Hub.
|
||||
In addition, repository owners in a Docker Pro subscription and team members in a Team, or a Business subscription can view the detailed scan reports. When scanning is enabled on a specific repository, anyone with push access can trigger a scan by pushing an image to Docker Hub.
|
||||
|
||||
> **Note**
|
||||
>
|
||||
|
@ -26,7 +26,7 @@ In addition, repository owners in a Pro plan and team members in a Team plan can
|
|||
|
||||
### Enable vulnerability scanning
|
||||
|
||||
Repository owners and administrators can enable vulnerability scanning on a repository. If you are a member of a Team plan, ensure the repository you would like to enable scanning on is part of the Team plan.
|
||||
Repository owners and administrators can enable vulnerability scanning on a repository. If you are a member of a Team or a Business subscription, ensure the repository you would like to enable scanning on is part of the Team or a Business tier.
|
||||
|
||||
To enable vulnerability scanning:
|
||||
|
||||
|
|
|
@ -31,8 +31,8 @@ protective while providing wide application compatibility. The default Docker
|
|||
profile can be found
|
||||
[here](https://github.com/moby/moby/blob/master/profiles/seccomp/default.json).
|
||||
|
||||
In effect, the profile is a whitelist which denies access to system calls by
|
||||
default, then whitelists specific system calls. The profile works by defining a
|
||||
In effect, the profile is a allowlist which denies access to system calls by
|
||||
default, then allowlists specific system calls. The profile works by defining a
|
||||
`defaultAction` of `SCMP_ACT_ERRNO` and overriding that action only for specific
|
||||
system calls. The effect of `SCMP_ACT_ERRNO` is to cause a `Permission Denied`
|
||||
error. Next, the profile defines a specific list of system calls which are fully
|
||||
|
@ -56,9 +56,9 @@ $ docker run --rm \
|
|||
|
||||
### Significant syscalls blocked by the default profile
|
||||
|
||||
Docker's default seccomp profile is a whitelist which specifies the calls that
|
||||
Docker's default seccomp profile is an allowlist which specifies the calls that
|
||||
are allowed. The table below lists the significant (but not all) syscalls that
|
||||
are effectively blocked because they are not on the whitelist. The table includes
|
||||
are effectively blocked because they are not on the Allowlist. The table includes
|
||||
the reason each syscall is blocked rather than white-listed.
|
||||
|
||||
| Syscall | Description |
|
||||
|
|
|
@ -19,8 +19,6 @@ significantly reduce the delay between writing code and running it in production
|
|||
You can download and install Docker on multiple platforms. Refer to the following
|
||||
section and choose the best installation path for you.
|
||||
|
||||
{% include eula.md %}
|
||||
|
||||
<div class="component-container">
|
||||
<!--start row-->
|
||||
<div class="row">
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
|
|
@ -7,21 +7,21 @@ redirect_from:
|
|||
- /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**.
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 97 KiB After Width: | Height: | Size: 48 KiB |
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
description: Docker subscription overview
|
||||
keywords: Docker, pricing, billing, Pro, Team, subscription, tier, plan
|
||||
keywords: Docker, pricing, billing, Pro, Team, business, subscription, tier, plan
|
||||
title: Docker subscription overview
|
||||
redirect_from:
|
||||
- /docker-hub/billing/
|
||||
|
@ -8,22 +8,23 @@ redirect_from:
|
|||
- /subscription/faq/
|
||||
---
|
||||
|
||||
On August 31, 2021, we [announced](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} updates and extensions to our product subscriptions to increase productivity, collaboration, and added security for our developers. Docker subscription tiers now include Personal, Pro, Team, and Business.
|
||||
On August 31, 2021, we [announced](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_"} updates and extensions to our product subscriptions to increase productivity, collaboration, and added security for our developers and businesses. Docker subscription tiers now include Personal, Pro, Team, and Business.
|
||||
|
||||
Here's a summary of the changes:
|
||||
### Here's a summary of the changes
|
||||
|
||||
- We’re introducing a new product subscription, Docker Business, for large enterprises that require features like registry restrictions, SSO, secure software supply chain management, and more.
|
||||
- Our Docker Subscription Service Terms include a change to the terms of use for Docker Desktop.
|
||||
- It remains free for small businesses (fewer than 250 employees AND less than $1 million in annual revenue), personal use, education, and non-commercial open source projects.
|
||||
- It requires a paid subscription (Pro, Team, or Business), for as little as $5 a month, for professional use in larger enterprises.
|
||||
- The effective date of these terms is 31 August 2021. There is a grace period until 31 January 2022 for those that will require a paid subscription to use Docker Desktop.
|
||||
- The Docker Pro and Docker Team subscriptions now include commercial use of Docker Desktop.
|
||||
- The existing Docker Free subscription has been renamed Docker Personal.
|
||||
- No changes to Docker Engine or any other upstream open source Docker or Moby project.
|
||||
- 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.
|
||||
|
||||
- Our [Docker Subscription Service Agreement](https://www.docker.com/legal/docker-subscription-service-agreement){: target="_blank" rel="noopener" class="_"} 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.
|
||||
|
||||
To understand how these changes affect you, read the [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}.
|
||||
|
||||
To compare features available in each subscription, see the [Docker Pricing](https://www.docker.com/pricing/){: target="_blank" rel="noopener" class="_"} page.
|
||||
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="_"}.
|
||||
|
||||
## Docker Personal
|
||||
|
||||
|
@ -35,49 +36,36 @@ For a list of features available in each tier, see [Docker Pricing](https://www.
|
|||
|
||||
## Docker Pro
|
||||
|
||||
**Docker Pro** enables individual developers to get more control of their development environment and provides an integrated and reliable developer experience. It includes unlimited public repositories, unlimited private repositories, unlimited [collaborators](../docker-hub/repos.md#collaborators-and-their-role) for public repositories, one [service account](../docker-hub/service-accounts.md) for private repositories, autobuilds with 5 parallel builds, starting at $5 per month with the annual subscription.
|
||||
**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.
|
||||
|
||||
> **Note**
|
||||
>
|
||||
> Docker Pro tiers allow one service account for private repositories. For more information, see [service accounts](../docker-hub/service-accounts.md). If you already have more than one collaborator in your private repository, you’ll not be able to add any further collaborators. Any new private repository that you create will be restricted to one service account.
|
||||
Docker Pro includes all the features available in Personal, additionally, it 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="_"}.
|
||||
|
||||
## Docker Team
|
||||
|
||||
The **Docker Team** tier includes unlimited public and unlimited private repositories starting at $25 per month for the first 5 users and $7 per month for each user thereafter with the annual subscription. In addition, the Team tier offers autobuilds with 15 parallel builds, advanced collaboration and management tools, including organization and team management with role-based access controls for the whole team.
|
||||
**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="_"}.
|
||||
|
||||
## Docker Business
|
||||
|
||||
The new Docker Business subscription enables organization-wide management and security for businesses that use Docker at scale. With an easy-to-use SaaS-based management plane, IT leaders can now efficiently monitor and manage all their Docker environments and accelerate their secure software supply chain initiatives.
|
||||
**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 capabilities available in the Pro and Team tiers, Docker Business tier adds the ability to control what registries and content developers can access, ensuring teams are building secure from the start by only pulling trusted base images.
|
||||
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="_"}.
|
||||
|
||||
## Docker Desktop license terms
|
||||
## Docker Desktop License Agreement
|
||||
|
||||
Docker Desktop is licensed under the [Docker Subscription Service Terms](https://www.docker.com/legal/docker-terms-service){: target="_blank" rel="noopener" class="_"}. When downloading and installing Docker Desktop, you will be asked to agree to the terms of service.
|
||||
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.
|
||||
|
||||
{:width="700px"}
|
||||
|
||||
Here's a summary of the key changes:
|
||||
|
||||
- Docker Desktop remains free for small businesses (fewer than 250 employees AND less than $1 million in revenue), personal use, education, and non-commercial open source projects.
|
||||
- It requires a paid subscription for professional use in larger enterprises.
|
||||
The effective date of these terms is 31 August 2021. There is a grace period until 31 January 2022 for those that will require a paid subscription to use Docker Desktop.
|
||||
- The Docker Pro, Team, and Business subscriptions include commercial use of Docker Desktop
|
||||
|
||||
You can also find a copy of the Docker Subscription Service Terms from the Docker menu. Select {: .inline} > **About Docker Desktop** > **Subscription Service Terms**.
|
||||
{% include desktop-license-update.md %}
|
||||
|
||||
Docker Desktop is built using open source software. For information about the licensing of open source components in Docker Desktop, Select {: .inline} > **About Docker Desktop** > **Acknowledgements**.
|
||||
|
||||
> **Note**
|
||||
>
|
||||
> The licensing and distribution terms for Docker and Moby open source projects such as Docker Engine are not changing.
|
||||
|
||||
For information on how to subscribe, see [Upgrade your subscription](../subscription/upgrade.md), or to learn more about the features available in each tier, see [Docker Pricing](https://www.docker.com/pricing){: target="_blank" rel="noopener" class="_"}.
|
||||
|
||||
For frequently asked questions about pricing, see [Docker subscription FAQs](https://www.docker.com/pricing/faq){: target="_blank" rel="noopener" class="_"}.
|
||||
> The licensing and distribution terms for Docker and Moby **open source** projects, such as Docker Engine, are not changing.
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
|
|
@ -1,37 +1,33 @@
|
|||
---
|
||||
description: Upgrading your Docker subscription
|
||||
keywords: Docker Hub, upgrade, subscription, Pro, Team, pricing plan,
|
||||
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="_"}.
|
||||
|
||||
## 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:
|
|||
|
||||
{: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="_"}.
|
||||
|
||||
## 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
|
||||
|
||||
|
|
Loading…
Reference in New Issue