mirror of https://github.com/docker/docs.git
Merge pull request #13651 from docker/master
Publish updates from master
This commit is contained in:
commit
dfb0d914d5
|
|
@ -12,6 +12,11 @@ redirect_from:
|
||||||
- /install/windows/ee-preview/
|
- /install/windows/ee-preview/
|
||||||
---
|
---
|
||||||
|
|
||||||
|
> **Update to the Docker Desktop terms**
|
||||||
|
>
|
||||||
|
> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022, for those that require a paid subscription. For more information, see [Docker Desktop License Agreement](../../subscription/index.md#docker-desktop-license-agreement).
|
||||||
|
{: .important}
|
||||||
|
|
||||||
Welcome to Docker Desktop for Windows. This page contains information about Docker Desktop for Windows system requirements, download URL, instructions to install and update Docker Desktop for Windows.
|
Welcome to Docker Desktop for Windows. This page contains information about Docker Desktop for Windows system requirements, download URL, instructions to install and update Docker Desktop for Windows.
|
||||||
|
|
||||||
> Download Docker Desktop for Windows
|
> Download Docker Desktop for Windows
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ This page contains information about the new features, improvements, known issue
|
||||||
|
|
||||||
### Known Issue
|
### Known Issue
|
||||||
|
|
||||||
Docker Desktop may fail to start when upgrading to 4.1.0 on some WSL-based distributions such as ArchWSL. See [docker/for-win#12229](https://github.com/docker/for-win/issues/12229.)
|
Docker Desktop may fail to start when upgrading to 4.1.0 on some WSL-based distributions such as ArchWSL. See [docker/for-win#12229](https://github.com/docker/for-win/issues/12229)
|
||||||
|
|
||||||
## Docker Desktop 4.0.1
|
## Docker Desktop 4.0.1
|
||||||
2021-09-13
|
2021-09-13
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,11 @@ title: Install Docker Engine on Ubuntu
|
||||||
toc_max: 4
|
toc_max: 4
|
||||||
---
|
---
|
||||||
|
|
||||||
|
> **Scan your images for vulnerabilities**
|
||||||
|
>
|
||||||
|
> Using open source components in your container images can introduce vulnerabilities. Run `docker scan` to start securing your images using Snyk. If you have a Docker Pro, Team, or a Business subscription, you can automatically scan images when you push an image to Docker Hub. See [Hub Vulnerability Scanning](../../docker-hub/vulnerability-scanning.md) for more information.
|
||||||
|
{: .important}
|
||||||
|
|
||||||
To get started with Docker Engine on Ubuntu, make sure you
|
To get started with Docker Engine on Ubuntu, make sure you
|
||||||
[meet the prerequisites](#prerequisites), then
|
[meet the prerequisites](#prerequisites), then
|
||||||
[install Docker](#installation-methods).
|
[install Docker](#installation-methods).
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,10 @@ redirect_from:
|
||||||
- /installation/
|
- /installation/
|
||||||
---
|
---
|
||||||
|
|
||||||
|
> **Update to the Docker Desktop terms**
|
||||||
|
>
|
||||||
|
> Professional use of Docker Desktop in large organizations (more than 250 employees or more than $10 million in revenue) requires users to have a paid Docker subscription. While the effective date of these terms is August 31, 2021, there is a grace period until January 31, 2022, for those that require a paid subscription. For more information, see the blog [Docker is Updating and Extending Our Product Subscriptions](https://www.docker.com/blog/updating-product-subscriptions/){: target="_blank" rel="noopener" class="_" id="dkr_docs_subscription_btl"}.
|
||||||
|
{: .important}
|
||||||
|
|
||||||
Docker is an open platform for developing, shipping, and running applications.
|
Docker is an open platform for developing, shipping, and running applications.
|
||||||
Docker enables you to separate your applications from your infrastructure so you
|
Docker enables you to separate your applications from your infrastructure so you
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue