mirror of https://github.com/docker/docs.git
Merge pull request #13541 from docker/master
Publish updates from master
This commit is contained in:
Usha Mandya
GitHub
commit
d0787a169a
|
|
@ -20,53 +20,63 @@
|
|||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-3 col-md-3">
|
||||
<ul class="footer_links">
|
||||
<li><b><a href="https://www.docker.com/why-docker">Why Docker?</a></b></li>
|
||||
<li><a href="https://www.docker.com/what-container">What is a Container?</a></li>
|
||||
<li><a href="https://docker.events.cube365.net/dockercon/">DockerCon</a></li>
|
||||
<li><b><a href="https://www.docker.com/products/overview">Products</a></b></li>
|
||||
<li><a href="https://www.docker.com/products/docker-desktop">Docker Desktop</a></li>
|
||||
<li><a href="https://www.docker.com/products/docker-hub">Docker Hub</a></li>
|
||||
<li><a href="https://www.docker.com/roadmap">Docker Product Roadmap</a></li>
|
||||
<li><b><a href="https://www.docker.com/products/docker-desktop">Features</a></b></li>
|
||||
<li><a href="https://www.docker.com/products/container-runtime">Container Runtime</a></li>
|
||||
<li><a href="https://www.docker.com/products/developer-tools">Developer Tools</a></li>
|
||||
<li><b><a href="https://www.docker.com/products" target="_blank" rel="noopener">Product offerings</a></b></li>
|
||||
<li><a href="https://www.docker.com/products/personal" target="_blank" rel="noopener">Docker Personal</a></li>
|
||||
<li><a href="https://www.docker.com/products/pro" target="_blank" rel="noopener">Docker Pro</a></li>
|
||||
<li><a href="https://www.docker.com/products/team" target="_blank" rel="noopener">Docker Team</a></li>
|
||||
<li><a href="https://www.docker.com/products/business" target="_blank" rel="noopener">Docker Business</a></li>
|
||||
<li><a href="https://www.docker.com/products" target="_blank" rel="noopener">Compare Subscriptions</a></li>
|
||||
<li><b><a href="https://www.docker.com/" target="_blank" rel="noopener">Features</a></b></li>
|
||||
<li><a href="https://www.docker.com/products/docker-desktop" target="_blank" rel="noopener">Docker Desktop</a></li>
|
||||
<li><a href="https://www.docker.com/products/docker-hub" target="_blank" rel="noopener">Docker Hub</a></li>
|
||||
<li><a href="https://www.docker.com/products/secure-software-supply-chain" target="_blank" rel="noopener">Secure Software Supply Chain</a></li>
|
||||
<li><a href="https://www.docker.com/products/container-runtime" target="_blank" rel="noopener">Container Runtime</a></li>
|
||||
<li><a href="https://www.docker.com/products/developer-tools" target="_blank" rel="noopener">Developer Tools</a></li>
|
||||
<li><a href="https://www.docker.com/partners" target="_blank" rel="noopener">Trusted Content</a></li>
|
||||
<li><a href="https://www.docker.com/roadmap" target="_blank" rel="noopener">Docker Product Roadmap</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-3 col-md-3">
|
||||
<ul class="footer_links">
|
||||
<li><b><a href="https://www.docker.com/products/docker-desktop">Developers</a></b></li>
|
||||
<li><a href="https://www.docker.com/use-cases">Use Cases</a></li>
|
||||
<li><a href="https://www.docker.com/docker-community">Community</a></li>
|
||||
<li><a href="https://www.docker.com/open-source">Open Source</a></li>
|
||||
<li><a href="https://www.docker.com/community/docker-captains">Docker Captains</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-3 col-md-3">
|
||||
<ul class="footer_links">
|
||||
<li><b><a href="https://www.docker.com/products/docker-desktop">Pricing</a></b></li>
|
||||
<li><a href="https://www.docker.com/pricing/faq">FAQs</a></li>
|
||||
<li><a href="https://www.docker.com/partners/programs">Docker Verified Publisher Program</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-3 col-md-3">
|
||||
<ul class="footer_links">
|
||||
<li><b><a href="https://www.docker.com/company" target="_blank" rel="noopener">Company</a></b></li>
|
||||
<li><a href="https://www.docker.com/company">About Us</a></li>
|
||||
<li><b><a href="https://www.docker.com/products/docker-desktop" target="_blank" rel="noopener">Developers</a></b></li>
|
||||
<li><a href="https://www.docker.com/use-cases" target="_blank" rel="noopener">Use Cases</a></li>
|
||||
<li><a href="https://docs.docker.com/get-started/" target="_blank" rel="noopener">Get Started</a></li>
|
||||
<li><a href="https://www.docker.com/blog/" target="_blank" rel="noopener">Blog</a></li>
|
||||
<li><a href="https://www.docker.com/customers">Customers</a></li>
|
||||
<li><a href="https://www.docker.com/partners">Partners</a></li>
|
||||
<li><a href="https://www.docker.com/company/newsroom">Newsroom</a></li>
|
||||
<li><a href="https://www.docker.com/careers">Careers</a></li>
|
||||
<li><a href="https://www.docker.com/company/contact">Contact Us</a></li>
|
||||
<li><a href="https://www.docker.com/docker-community" target="_blank" rel="noopener">Community</a></li>
|
||||
<li><a href="https://www.docker.com/open-source" target="_blank" rel="noopener">Open Source</a></li>
|
||||
<li><a href="https://www.docker.com/community/get-involved/developer-preview" target="_blank" rel="noopener">Preview Program</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-3 col-md-3">
|
||||
<ul class="footer_links">
|
||||
<li><b><a href="https://www.docker.com/products/docker-desktop" target="_blank" rel="noopener">Pricing</a></b></li>
|
||||
<li><a href="https://www.docker.com/pricing/faq" target="_blank" rel="noopener">FAQ</a></li>
|
||||
<li><a href="https://www.docker.com/partners/programs" target="_blank" rel="noopener">Docker Verified Publisher</a></li>
|
||||
<li><a href="https://www.docker.com/partners" target="_blank" rel="noopener">Partners</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-3 col-md-3">
|
||||
<ul class="footer_links">
|
||||
<li><b><a href="https://www.docker.com/company" target="_blank" rel="noopener">About Us</a></b></li>
|
||||
<li><a href="https://www.docker.com/what-container" target="_blank" rel="noopener">What is a Container?</a></li>
|
||||
<li><a href="https://www.docker.com/why-docker" target="_blank" rel="noopener">Why Docker?</a></li>
|
||||
<li><a href="https://www.docker.com/events" target="_blank" rel="noopener">Virtual Events</a></li>
|
||||
<li><a href="https://www.docker.com/swag" target="_blank" rel="noopener">Swag Store
|
||||
</a></li>
|
||||
<li><a href="https://www.docker.com/company/newsroom" target="_blank" rel="noopener">Newsroom</a></li>
|
||||
<li><a href="https://www.docker.com/careers" target="_blank" rel="noopener">Careers</a></li>
|
||||
<li><a href="https://www.docker.com/company/contact" target="_blank" rel="noopener">Contact Us</a></li>
|
||||
<li><a href="https://www.docker.com/customers" target="_blank" rel="noopener">Customers</a></li>
|
||||
<li><a href="https://www.docker.com/newsletter-subscription" target="_blank" rel="noopener">Newsletter</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="footer-nav">
|
||||
<nav class="footer_sub_nav">
|
||||
<ul class="menu">
|
||||
<li><a href="http://status.docker.com/">Status</a></li>
|
||||
<li><a href="https://www.docker.com/legal">Legal</a></li>
|
||||
<li><a href="https://www.docker.com/company/contact">Contact</a></li>
|
||||
<li><a href="https://www.docker.com/legal/docker-terms-service" target="_blank" rel="noopener">Terms of Service</a></li>
|
||||
<li><a href="https://status.docker.com/" target="_blank" rel="noopener">Status</a></li>
|
||||
<li><a href="https://www.docker.com/legal" target="_blank" rel="noopener">Legal</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -15,6 +15,13 @@ toc_max: 2
|
|||
|
||||
For information about Docker Desktop system requirements, see [Docker Desktop for Mac system requirements](mac/install.md#system-requirements) and [Docker Desktop for Windows system requirements](windows/install.md#system-requirements).
|
||||
|
||||
### Where does Docker Desktop get installed on my machine?
|
||||
|
||||
By default, Docker Desktop is installed at the following location:
|
||||
|
||||
- On Mac: `/Applications/Docker.app`
|
||||
- On Windows: `C:\Program Files\Docker\Docker`
|
||||
|
||||
### Do I need to pay to use Docker Desktop?
|
||||
|
||||
Docker Desktop remains free for small businesses (fewer than 250 employees AND less than $10 million in revenue), personal use, education, and non-commercial open-source projects. It requires a paid subscription for professional use in larger enterprises.
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ Welcome to Docker Desktop for Mac. This page contains information about Docker D
|
|||
|
||||
> Download Docker Desktop for Mac
|
||||
>
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn }
|
||||
> [Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/main/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/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn }
|
||||
|
||||
## System requirements
|
||||
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ This page contains information about the new features, improvements, known issue
|
|||
|
||||
> Download Docker Desktop
|
||||
>
|
||||
> [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 }
|
||||
> [Mac with Intel chip](https://desktop.docker.com/mac/main/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/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn }
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ Welcome to Docker Desktop for Windows. This page contains information about Dock
|
|||
|
||||
> Download Docker Desktop for Windows
|
||||
>
|
||||
> [Docker Desktop for Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe){: .button .primary-btn }
|
||||
> [Docker Desktop for Windows](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe){: .button .primary-btn }
|
||||
|
||||
## System requirements
|
||||
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@ This page contains information about the new features, improvements, known issue
|
|||
|
||||
> Download Docker Desktop
|
||||
>
|
||||
> [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 }
|
||||
> [For Windows](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn }
|
||||
|
||||
### Upgrades
|
||||
|
||||
- [Compose V2 RC3](https://github.com/docker/compose-cli/releases/tag/v2.0.0-rc.3)
|
||||
- [Compose V2 RC3](https://github.com/docker/compose/releases/tag/v2.0.0-rc.3)
|
||||
- Compose v2 is now hosted on github.com/docker/compose.
|
||||
- Fixed go panic on downscale using `compose up --scale`.
|
||||
- Fixed a race condition in `compose run --rm` while capturing exit code.
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ For example, a developer, who is part of an organization, building a new contain
|
|||
## Configure Image Access Management permissions
|
||||
|
||||
1. Log into your [Docker Hub](https://hub.docker.com) account as an organization administrator.
|
||||
2. Select an organization, and navigate to the **Settings** tab on the **Organizations** page and click Org images.
|
||||
2. Select an organization, and navigate to the **Settings** tab on the **Organizations** page and click Org Permissions.
|
||||
|
||||
{:width="700px"}
|
||||
|
||||
|
|
|
|||
|
|
@ -80,9 +80,9 @@ We also recommend the video walkthrough from DockerCon 2020.
|
|||
This tutorial assumes you have a current version of Docker installed on your
|
||||
machine. If you do not have Docker installed, choose your preferred operating system below to download Docker:
|
||||
|
||||
[Mac with Intel chip](https://desktop.docker.com/mac/stable/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64){: .button .primary-btn .accept-eula }
|
||||
[Mac with Apple chip](https://desktop.docker.com/mac/stable/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn .accept-eula }
|
||||
[Windows](https://desktop.docker.com/win/stable/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn .accept-eula }
|
||||
[Mac with Intel chip](https://desktop.docker.com/mac/main/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/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64){: .button .primary-btn }
|
||||
[Windows](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-win-amd64){: .button .primary-btn }
|
||||
[Linux](../engine/install/index.md){: .button .primary-btn}
|
||||
|
||||
For Docker Desktop installation instructions, see [Install Docker Desktop on Mac](../desktop/mac/install.md) and [Install Docker Desktop on Windows](../desktop/windows/install.md).
|
||||
|
|
|
|||
Loading…
Reference in New Issue