mirror of https://github.com/docker/docs.git
Desktop: move "docker-for-mac" to "desktop/mac"
Unifying all content related to Docker Desktop to be withing the desktop directory. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
parent
d3dcf610e8
commit
d0bf342e52
|
|
@ -71,7 +71,7 @@ Docker: |
|
|||
- The docker daemon process running on the host which manages images and containers
|
||||
(also called Docker Engine)
|
||||
Docker Desktop for Mac: |
|
||||
[Docker Desktop for Mac](/docker-for-mac/) is an easy-to-install, lightweight
|
||||
[Docker Desktop for Mac](/desktop/mac/) is an easy-to-install, lightweight
|
||||
Docker development environment designed specifically for the Mac. A native
|
||||
Mac application, Docker Desktop for Mac uses the macOS Hypervisor
|
||||
framework, networking, and filesystem. It's the best solution if you want
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ source,destination
|
|||
/engine/quickstart/,/get-started/
|
||||
/engine/containers/,/engine/tutorials/
|
||||
/win/,/docker-for-windows/
|
||||
/mac/,/docker-for-mac/
|
||||
/mac/,/desktop/mac/
|
||||
/linux/,/engine/
|
||||
/article-img/,/engine/article-img/
|
||||
/articles/,/engine/articles/
|
||||
|
|
|
|||
|
|
|
@ -1186,21 +1186,21 @@ manuals:
|
|||
title: Overview
|
||||
- sectiontitle: Mac
|
||||
section:
|
||||
- path: /docker-for-mac/install/
|
||||
- path: /desktop/mac/install/
|
||||
title: Install Docker Desktop for Mac
|
||||
- path: /docker-for-mac/
|
||||
- path: /desktop/mac/
|
||||
title: User manual
|
||||
- path: /docker-for-mac/networking/
|
||||
- path: /desktop/mac/networking/
|
||||
title: Networking
|
||||
- path: /docker-for-mac/space/
|
||||
- path: /desktop/mac/space/
|
||||
title: Disk utilization
|
||||
- path: /docker-for-mac/troubleshoot/
|
||||
- path: /desktop/mac/troubleshoot/
|
||||
title: Logs and troubleshooting
|
||||
- path: /docker-for-mac/apple-silicon/
|
||||
- path: /desktop/mac/apple-silicon/
|
||||
title: Apple silicon
|
||||
- path: /docker-for-mac/release-notes/
|
||||
- path: /desktop/mac/release-notes/
|
||||
title: Release notes
|
||||
- path: /docker-for-mac/previous-versions/
|
||||
- path: /desktop/mac/previous-versions/
|
||||
title: Previous versions
|
||||
- sectiontitle: Windows
|
||||
section:
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@ Starting with Docker Desktop 3.0.0, updates to Docker Desktop will be available
|
|||
|
||||
> 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.
|
||||
|
||||
{:width="500px"}
|
||||
{:width="500px"}
|
||||
|
||||
Click **Download update** When you are ready to download the update. This downloads the update in the background. After downloading the update, click **Update and restart** from the Docker menu. This installs the latest update and restarts Docker Desktop for the changes to take effect.
|
||||
|
|
|
|||
|
|
@ -214,7 +214,7 @@
|
|||
</a>
|
||||
</p>
|
||||
<p class="only-mac">
|
||||
<a href="/docker-for-mac/install/#system-requirements">
|
||||
<a href="/desktop/mac/install/#system-requirements">
|
||||
What are the system requirements for Docker Desktop?
|
||||
</a>
|
||||
</p>
|
||||
|
|
@ -232,12 +232,12 @@
|
|||
<div class="col-xs-12 col-md-4 col-lg-5">
|
||||
<h6>Popular articles</h6>
|
||||
<p class="only-win"><a href="/docker-for-windows/wsl/">Docker Desktop WSL 2 backend</a></p>
|
||||
<p class="only-mac"><a href="/docker-for-mac/install/">Install Docker Desktop on Mac</a></p>
|
||||
<p class="only-mac"><a href="/desktop/mac/install/">Install Docker Desktop on Mac</a></p>
|
||||
<p><a href="/desktop/dashboard/">Docker Desktop Dashboard</a></p>
|
||||
<p class="only-win"><a href="/desktop/kubernetes/">Deploy on Kubernetes</a></p>
|
||||
<p class="only-win"><a href="/docker-for-windows/release-notes/">Release notes</a></p>
|
||||
<p class="only-win"><a href="/docker-for-windows/troubleshoot/">Logs and troubleshooting</a></p>
|
||||
<p class="only-mac"><a href="/docker-for-mac/networking/">Networking features in Docker Desktop</a></p>
|
||||
<p class="only-mac"><a href="/desktop/mac/networking/">Networking features in Docker Desktop</a></p>
|
||||
</div>
|
||||
</div>
|
||||
<!-- HUB -->
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ To deploy Docker containers on Azure, you must meet the following requirements:
|
|||
|
||||
1. Download and install the latest version of Docker Desktop.
|
||||
|
||||
- [Download for Mac](../docker-for-mac/install.md)
|
||||
- [Download for Mac](../desktop/mac/install.md)
|
||||
- [Download for Windows](../docker-for-windows/install.md)
|
||||
|
||||
Alternatively, install the [Docker Compose CLI for Linux](#install-the-docker-compose-cli-on-linux).
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ To deploy Docker containers on ECS, you must meet the following requirements:
|
|||
|
||||
1. Download and install the latest version of Docker Desktop.
|
||||
|
||||
- [Download for Mac](../docker-for-mac/install.md)
|
||||
- [Download for Mac](../desktop/mac/install.md)
|
||||
- [Download for Windows](../docker-for-windows/install.md)
|
||||
|
||||
Alternatively, install the [Docker Compose CLI for Linux](#install-the-docker-compose-cli-on-linux).
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ Introduction of the [Compose specification](https://github.com/compose-spec/comp
|
|||
|
||||
While docker-compose is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. This allows us to include community proposals, experimental implementations by the Docker CLI and/or Engine, and deliver features faster to users. Compose V2 also supports some of the newer additions to the Compose specification, such as [profiles](profiles.md) and [GPU](gpu-support.md) devices.
|
||||
|
||||
Additionally, Compose V2 also supports [Apple silicon](../docker-for-mac/apple-silicon.md).
|
||||
Additionally, Compose V2 also supports [Apple silicon](../desktop/mac/apple-silicon.md).
|
||||
|
||||
For more information about the flags that are supported in the new compose command, see the [docker-compose compatibility list](cli-command-compatibility.md).
|
||||
|
||||
|
|
@ -46,7 +46,7 @@ We will progressively turn Docker Compose V2 on automatically for Docker Desktop
|
|||
|
||||
For Docker Desktop installation instructions, see:
|
||||
|
||||
- [Install Docker Desktop on Mac](../docker-for-mac/install.md)
|
||||
- [Install Docker Desktop on Mac](../desktop/mac/install.md)
|
||||
- [Install Docker Desktop on Windows](../docker-for-windows/install.md)
|
||||
|
||||
To disable Docker Compose V2 using Docker Desktop:
|
||||
|
|
|
|||
|
|
@ -277,7 +277,7 @@ mount is denied, or a service cannot start, try enabling file or drive sharing.
|
|||
Volume mounting requires shared drives for projects that live outside of
|
||||
`C:\Users` (Windows) or `/Users` (Mac), and is required for _any_ project on
|
||||
Docker Desktop for Windows that uses [Linux containers](../docker-for-windows/index.md#switch-between-windows-and-linux-containers).
|
||||
For more information, see [File sharing](../docker-for-mac/index.md#file-sharing) on Docker
|
||||
For more information, see [File sharing](../desktop/mac/index.md#file-sharing) on Docker
|
||||
for Mac, and the general examples on how to
|
||||
> [Manage data in containers](../storage/volumes.md).
|
||||
>
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ Python package manager or installing Compose as a container.
|
|||
|
||||
**Docker Desktop for Mac** includes Compose along
|
||||
with other Docker apps, so Mac users do not need to install Compose separately.
|
||||
For installation instructions, see [Install Docker Desktop on Mac](../docker-for-mac/install.md).
|
||||
For installation instructions, see [Install Docker Desktop on Mac](../desktop/mac/install.md).
|
||||
|
||||
</div>
|
||||
<div id="windows" class="tab-pane fade" markdown="1">
|
||||
|
|
|
|||
|
|
@ -2412,7 +2412,7 @@ The highlights:
|
|||
|
||||
This means the GitHub repository has moved to [https://github.com/docker/fig](https://github.com/docker/fig) and our IRC channel is now #docker-fig on Freenode.
|
||||
|
||||
- Fig can be used with the [official Docker OS X installer](../docker-for-mac/install.md). Boot2Docker will mount the home directory from your host machine so volumes work as expected.
|
||||
- Fig can be used with the [official Docker OS X installer](../desktop/mac/install.md). Boot2Docker will mount the home directory from your host machine so volumes work as expected.
|
||||
|
||||
- Fig supports Docker 1.3.
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ computer.
|
|||
|
||||
After backing up your data, you can uninstall the current version of Docker Desktop
|
||||
and install a different version ([Windows](../docker-for-windows/install.md)
|
||||
[macOS](../docker-for-mac/install.md), or reset Docker Desktop to factory defaults.
|
||||
[macOS](mac/install.md), or reset Docker Desktop to factory defaults.
|
||||
|
||||
## Restore your data
|
||||
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@ Dev Environments also allow you to switch between your developer environments or
|
|||
|
||||
To access Dev Environments, from the Docker menu, select **Dashboard** > **Dev Environments**.
|
||||
|
||||
{:width="700px"}
|
||||
{:width="700px"}
|
||||
|
||||
## Prerequisites
|
||||
|
||||
Dev Environments are available as part of Docker Desktop 3.5.0 release. Download and install **Docker Desktop 3.5.0** or higher:
|
||||
|
||||
- [Mac](https://docs.docker.com/docker-for-mac/release-notes/)
|
||||
- [Windows](https://docs.docker.com/docker-for-windows/release-notes/)
|
||||
- [Mac](mac/release-notes.md)
|
||||
- [Windows](../docker-for-windows/release-notes.md)
|
||||
|
||||
To get started with Dev Environments, you must have the following tools and extension installed on your machine:
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ If you have already installed Git, and it's not detected properly, run the follo
|
|||
|
||||
If it doesn't detect Git as a valid command, you must reinstall Git and ensure you choose the option **Git from the command line...** or the **Use Git and optional Unix tools...** on the **Adjusting your PATH environment** step.
|
||||
|
||||
{:width="300px"}
|
||||
{:width="300px"}
|
||||
|
||||
## Start a single container Dev Environment
|
||||
|
||||
|
|
@ -56,7 +56,7 @@ The simplest way to get started with Dev Environments is to create a new environ
|
|||
|
||||
This clones the Git code inside a volume, determines the best image for your Dev Environment, and finally, opens VS Code inside the Dev Environment container.
|
||||
|
||||
{:width="700px"}
|
||||
{:width="700px"}
|
||||
|
||||
In the above example, the names `amazing_mclaren` and `stoic_carver` are randomly generated. You'll most likely see different names when you create your Dev Environment.
|
||||
|
||||
|
|
@ -64,7 +64,7 @@ Hover over the container and click **Open in VS Code** to start working in VS Co
|
|||
|
||||
You can launch the application by running the command `make run` in your VS Code terminal. This opens an http server on port 8080. Open [http://localhost:8080](http://localhost:8080) in your browser to see the running application.
|
||||
|
||||
{:width="700px"}
|
||||
{:width="700px"}
|
||||
|
||||
### Create a Dev Environment from a specific branch or tag
|
||||
|
||||
|
|
@ -90,11 +90,11 @@ Let's summarize the tasks we performed so far to start a single container Dev En
|
|||
|
||||
If you are a member of the Docker [Team plan](https://www.docker.com/pricing?utm_source=docker&utm_medium=webreferral&utm_campaign=docs_driven_upgrade){: target="_blank" rel="noopener" class="_"}, you can now share you Dev Environment with your team. When you are ready to share your environment, just click the **Share** button and specify the Docker Hub namespace where you'd like to push your Dev Environment to.
|
||||
|
||||
{:width="700px"}
|
||||
{:width="700px"}
|
||||
|
||||
This creates a Docker image of your dev environment, uploads it to the Docker Hub namespace you have specified in the previous step, and provides a tiny URL which you can use to share your work with your team members.
|
||||
|
||||
{:width="700px"}
|
||||
{:width="700px"}
|
||||
|
||||
Your team members need to open the **Create** dialog, select the **Existing Dev Environment** tab, and then paste the URL. Your Dev Environment now starts in the exact same state as you shared it.
|
||||
|
||||
|
|
@ -116,7 +116,7 @@ You can also use Dev Environments to collaborate on any Docker Compose-based pro
|
|||
- Creates volumes and networks
|
||||
- Starts the Compose stack
|
||||
|
||||
{:width="700px"}
|
||||
{:width="700px"}
|
||||
|
||||
Now your application is up and running, you can check by opening [http://localhost:8080](http://localhost:8080) in your browser.
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ toc_max: 2
|
|||
|
||||
### What are the system requirements for Docker Desktop?
|
||||
|
||||
For information about Docker Desktop system requirements, see [Docker Desktop for Mac system requirements](../docker-for-mac/install.md#system-requirements) and [Docker Desktop for Windows system requirements](../docker-for-windows/install.md#system-requirements).
|
||||
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](../docker-for-windows/install.md#system-requirements).
|
||||
|
||||
### What is an experimental feature?
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ For information about Docker Desktop system requirements, see [Docker Desktop fo
|
|||
|
||||
### Where can I find information about diagnosing and troubleshooting Docker Desktop issues?
|
||||
|
||||
You can find information about diagnosing and troubleshooting common issues in the Troubleshooting topic. See [Mac Logs and Troubleshooting](../docker-for-mac/troubleshoot.md) topic and Windows Logs and [Windows Logs and Troubleshooting](../docker-for-windows/troubleshoot.md).
|
||||
You can find information about diagnosing and troubleshooting common issues in the Troubleshooting topic. See [Mac Logs and Troubleshooting](mac/troubleshoot.md) topic and Windows Logs and [Windows Logs and Troubleshooting](../docker-for-windows/troubleshoot.md).
|
||||
|
||||
If you do not find a solution in Troubleshooting, browse issues on
|
||||
[docker/for-mac](https://github.com/docker/for-mac/issues){: target="_blank" rel="noopener" class="_"} or [docker/for-win](https://github.com/docker/for-win/issues){: target="_blank" rel="noopener" class="_"} GitHub repository, or create a new one.
|
||||
|
|
@ -52,19 +52,19 @@ For details, see [Docker Engine API](../engine/api/index.md).
|
|||
Both Mac and Windows have a changing IP address (or none if you have no network access). On both Mac and Windows, we recommend that you connect to the special DNS name `host.docker.internal`, which resolves to the internal IP address used by the host. This is for development purposes and does not work in a production environment outside of Docker Desktop.
|
||||
|
||||
For more information and examples, see how to connect from a container to a service on the host
|
||||
[on Mac](../docker-for-mac/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host) and [on Windows](../docker-for-windows/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host).
|
||||
[on Mac](mac/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host) and [on Windows](../docker-for-windows/networking.md#i-want-to-connect-from-a-container-to-a-service-on-the-host).
|
||||
|
||||
### How do I connect to a container from Mac or Windows?
|
||||
|
||||
We recommend that you publish a port, or connect from another container. Port forwarding works for `localhost`; `--publish`, `-p`, or `-P` all work.
|
||||
|
||||
For more information and examples, see
|
||||
[I want to connect to a container from Mac](../docker-for-mac/networking.md#i-want-to-connect-to-a-container-from-the-mac) and [I want to connect to a container from Windows](../docker-for-windows/networking.md#i-want-to-connect-to-a-container-from-the-mac).
|
||||
[I want to connect to a container from Mac](mac/networking.md#i-want-to-connect-to-a-container-from-the-mac) and [I want to connect to a container from Windows](../docker-for-windows/networking.md#i-want-to-connect-to-a-container-from-the-mac).
|
||||
|
||||
### How do I add custom CA certificates?
|
||||
|
||||
Docker Desktop supports all trusted certificate authorities (CAs) (root or intermediate). For more information on adding server and client side certs, see
|
||||
[Add TLS certificates on Mac](../docker-for-mac/index.md#add-tls-certificates) and [Add TLS certificates on Windows](../docker-for-windows/index.md#adding-tls-certificates).
|
||||
[Add TLS certificates on Mac](mac/index.md#add-tls-certificates) and [Add TLS certificates on Windows](../docker-for-windows/index.md#adding-tls-certificates).
|
||||
|
||||
### Can I pass through a USB device to a container?
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ After updating the `settings.json` file, close and restart Docker Desktop to app
|
|||
|
||||
### When will Docker Desktop move to a cumulative release stream?
|
||||
|
||||
Starting with version 3.0.0, Docker Desktop will be available as a single, cumulative release stream. This is the same version for both Stable and Edge users. The next release after Docker Desktop 3.0.0 will be the first to be applied as a delta update. For more information, see [Automatic updates](../docker-for-mac/install.md#automatic-updates).
|
||||
Starting with version 3.0.0, Docker Desktop will be available as a single, cumulative release stream. This is the same version for both Stable and Edge users. The next release after Docker Desktop 3.0.0 will be the first to be applied as a delta update. For more information, see [Automatic updates](mac/install.md#automatic-updates).
|
||||
|
||||
### How do new users install Docker Desktop?
|
||||
|
||||
|
|
@ -124,7 +124,7 @@ 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](../docker-for-mac/troubleshoot.md#support).
|
||||
Yes, Docker Desktop offers support for Pro and Team users. 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="_"}.
|
||||
|
||||
|
|
@ -151,7 +151,7 @@ For more information, see [Docker Data Processing Agreement](https://www.docker.
|
|||
|
||||
### Is Docker Desktop compatible with Apple silicon processors?
|
||||
|
||||
Yes, you can now install Docker Desktop for Mac on Apple silicon. For more information, see [Docker Desktop for Apple silicon](../docker-for-mac/apple-silicon.md).
|
||||
Yes, you can now install Docker Desktop for Mac on Apple silicon. For more information, see [Docker Desktop for Apple silicon](mac/apple-silicon.md).
|
||||
|
||||
### What is HyperKit?
|
||||
|
||||
|
|
|
|||
|
|
@ -26,19 +26,19 @@ Some of the key features of Docker Desktop include:
|
|||
|
||||
Docker Desktop is available for Mac and Windows. For download information, system requirements, and installation instructions, see:
|
||||
|
||||
* [Install Docker Desktop on Mac](../docker-for-mac/install.md)
|
||||
* [Install Docker Desktop on Mac](mac/install.md)
|
||||
* [Install Docker Desktop on Windows](../docker-for-windows/install.md)
|
||||
|
||||
## Configure Docker Desktop
|
||||
|
||||
To learn about the various UI options and their usage, see:
|
||||
|
||||
* [Docker Desktop for Mac user manual](../docker-for-mac/index.md)
|
||||
* [Docker Desktop for Mac user manual](mac/index.md)
|
||||
* [Docker Desktop for Windows user manual](../docker-for-windows/index.md)
|
||||
|
||||
## Release notes
|
||||
|
||||
For information about new features, improvements, and bug fixes in Docker Desktop releases, see:
|
||||
|
||||
* [Docker Desktop for Mac Release notes](../docker-for-mac/release-notes.md)
|
||||
* [Docker Desktop for Mac Release notes](mac/release-notes.md)
|
||||
* [Docker Desktop for Windows Release notes](../docker-for-windows/release-notes.md)
|
||||
|
|
|
|||
|
|
@ -6,11 +6,12 @@ toc_min: 2
|
|||
toc_max: 3
|
||||
redirect_from:
|
||||
- /docker-for-mac/apple-m1/
|
||||
- /docker-for-mac/apple-silicon/
|
||||
---
|
||||
|
||||
Docker Desktop for Mac on Apple silicon is now available as a GA release. This enables you to develop applications with your choice of local development environments, and extends development pipelines for ARM-based applications.
|
||||
|
||||
Docker Desktop for Apple silicon also supports multi-platform images, which allows you to build and run images for both x86 and ARM architectures without having to set up a complex cross-compilation development environment. Additionally, you can use [docker buildx](../engine/reference/commandline/buildx.md){:target="_blank" rel="noopener" class="_"} to seamlessly integrate multi-platform builds into your build pipeline, and use [Docker Hub](https://hub.docker.com/){:target="_blank" rel="noopener" class="_"} to identify and share repositories that provide multi-platform images.
|
||||
Docker Desktop for Apple silicon also supports multi-platform images, which allows you to build and run images for both x86 and ARM architectures without having to set up a complex cross-compilation development environment. Additionally, you can use [docker buildx](../../engine/reference/commandline/buildx.md){:target="_blank" rel="noopener" class="_"} to seamlessly integrate multi-platform builds into your build pipeline, and use [Docker Hub](https://hub.docker.com/){:target="_blank" rel="noopener" class="_"} to identify and share repositories that provide multi-platform images.
|
||||
|
||||
Download Docker Desktop for Mac on Apple silicon:
|
||||
|
||||
|
|
@ -9,7 +9,7 @@ toc_max: 2
|
|||
This page contains information about Docker Desktop Edge releases. Edge releases give you early access to our newest features. Note that some of the features may be experimental, and some of them may not ever reach the Stable release.
|
||||
|
||||
For information about Stable releases, see the [Stable release notes](release-notes.md). For Docker Desktop system requirements, see
|
||||
[What to know before you install](install.md#what-to-know-before-you-install).
|
||||
[What to know before you install](install.md#system-requirements).
|
||||
|
||||
## Docker Desktop Community 2.5.4
|
||||
2020-12-07
|
||||
|
|
@ -989,7 +989,7 @@ This release contains a Kubernetes upgrade. Note that your local Kubernetes clus
|
|||
- [Docker 17.12.0-ce](https://github.com/docker/docker-ce/releases/tag/v17.12.0-ce)
|
||||
|
||||
* New
|
||||
- Experimental Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker For Mac Preferences and use kubectl commands as well as docker commands. See [https://docs.docker.com/docker-for-mac/kubernetes/](kubernetes.md)
|
||||
- Experimental Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker For Mac Preferences and use kubectl commands as well as docker commands. See [the Kubernetes section](../kubernetes.md)
|
||||
- DNS name `docker.for.mac.host.internal` should be used instead of `docker.for.mac.localhost` (still valid) for host resolution from containers, since since there is an RFC banning the use of subdomains of localhost (See https://tools.ietf.org/html/draft-west-let-localhost-be-localhost-06).
|
||||
|
||||
* Bug fixes and minor changes
|
||||
|
|
@ -1196,7 +1196,7 @@ TCP connection is idle for more than five minutes (related to
|
|||
|
||||
- Add daemon options validation
|
||||
- Diagnose can be cancelled & Improved help information. Fixes [docker/for-mac#1134](https://github.com/docker/for-mac/issues/1134), [docker/for-mac#1474](https://github.com/docker/for-mac/issues/1474)
|
||||
- Support paging of Docker Cloud [repositories](../docker-hub/repos.md) and [organizations](../docker-hub/orgs.md). Fixes [docker/for-mac#1538](https://github.com/docker/for-mac/issues/1538)
|
||||
- Support paging of Docker Cloud [repositories](../../docker-hub/repos.md) and [organizations](../../docker-hub/orgs.md). Fixes [docker/for-mac#1538](https://github.com/docker/for-mac/issues/1538)
|
||||
|
||||
### Docker Community Edition 17.06.1-ce-mac20, 2017-07-18
|
||||
|
||||
|
|
@ -2049,7 +2049,7 @@ events or unexpected unmounts.
|
|||
|
||||
**Bug fixes and minor changes**
|
||||
|
||||
* Documentation moved to [https://docs.docker.com/docker-for-mac/](index.md)
|
||||
* Documentation moved to [https://docs.docker.com/desktop/mac/](index.md)
|
||||
* Allow non-admin users to launch the app for the first time (using admin creds)
|
||||
* Prompt non-admin users for admin password when needed in Preferences
|
||||
* Fixed download links, documentation links
|
||||
|
Before Width: | Height: | Size: 73 KiB After Width: | Height: | Size: 73 KiB |
|
Before Width: | Height: | Size: 341 KiB After Width: | Height: | Size: 341 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 256 KiB After Width: | Height: | Size: 256 KiB |
|
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 60 KiB |
|
Before Width: | Height: | Size: 65 KiB After Width: | Height: | Size: 65 KiB |
|
Before Width: | Height: | Size: 478 KiB After Width: | Height: | Size: 478 KiB |
|
Before Width: | Height: | Size: 81 KiB After Width: | Height: | Size: 81 KiB |
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
|
Before Width: | Height: | Size: 118 KiB After Width: | Height: | Size: 118 KiB |
|
Before Width: | Height: | Size: 421 KiB After Width: | Height: | Size: 421 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 76 KiB After Width: | Height: | Size: 76 KiB |
|
Before Width: | Height: | Size: 90 KiB After Width: | Height: | Size: 90 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 6.0 KiB After Width: | Height: | Size: 6.0 KiB |
|
Before Width: | Height: | Size: 568 B After Width: | Height: | Size: 568 B |
|
|
@ -2,6 +2,7 @@
|
|||
description: Getting Started
|
||||
keywords: mac, tutorial, run, docker, local, machine
|
||||
redirect_from:
|
||||
- /docker-for-mac/
|
||||
- /docker-for-mac/index/
|
||||
- /docker-for-mac/mutagen/
|
||||
- /docker-for-mac/mutagen-caching/
|
||||
|
|
@ -107,8 +108,8 @@ File share settings are:
|
|||
* Shared folders are designed to allow application code to be edited
|
||||
on the host while being executed in containers. For non-code items
|
||||
such as cache directories or databases, the performance will be much
|
||||
better if they are stored in the Linux VM, using a [data volume](../storage/volumes.md)
|
||||
(named volume) or [data container](../storage/volumes.md).
|
||||
better if they are stored in the Linux VM, using a [data volume](../../storage/volumes.md)
|
||||
(named volume) or [data container](../../storage/volumes.md).
|
||||
>
|
||||
* If you share the whole of your home directory into a container, MacOS may
|
||||
prompt you to give Docker access to personal areas of your home directory such as
|
||||
|
|
@ -212,7 +213,7 @@ Server: Docker Engine - Community
|
|||
Docker Desktop includes a standalone Kubernetes server that runs on your Mac, so
|
||||
that you can test deploying your Docker workloads on Kubernetes. To enable Kubernetes support and install a standalone instance of Kubernetes running as a Docker container, select **Enable Kubernetes**.
|
||||
|
||||
For more information about using the Kubernetes integration with Docker Desktop, see [Deploy on Kubernetes](../desktop/kubernetes.md){:target="_blank" rel="noopener" class="_"}.
|
||||
For more information about using the Kubernetes integration with Docker Desktop, see [Deploy on Kubernetes](../kubernetes.md){:target="_blank" rel="noopener" class="_"}.
|
||||
|
||||
### Reset
|
||||
|
||||
|
|
@ -224,7 +225,7 @@ For information about the reset options, see [Logs and Troubleshooting](troubles
|
|||
|
||||
## Dashboard
|
||||
|
||||
The Docker Desktop Dashboard enables you to interact with containers and applications and manage the lifecycle of your applications directly from your machine. The Dashboard UI shows all running, stopped, and started containers with their state. It provides an intuitive interface to perform common actions to inspect and manage containers and existing Docker Compose applications. For more information, see [Docker Desktop Dashboard](../desktop/dashboard.md).
|
||||
The Docker Desktop Dashboard enables you to interact with containers and applications and manage the lifecycle of your applications directly from your machine. The Dashboard UI shows all running, stopped, and started containers with their state. It provides an intuitive interface to perform common actions to inspect and manage containers and existing Docker Compose applications. For more information, see [Docker Desktop Dashboard](../dashboard.md).
|
||||
|
||||
## Add TLS certificates
|
||||
|
||||
|
|
@ -322,7 +323,7 @@ also in your keychain.
|
|||
|
||||
To learn more about how to install a CA root certificate for the registry and
|
||||
how to set the client TLS certificate for verification, see
|
||||
[Verify repository client with certificates](../engine/security/certificates.md)
|
||||
[Verify repository client with certificates](../../engine/security/certificates.md)
|
||||
in the Docker Engine topics.
|
||||
|
||||
## Install shell completion
|
||||
|
|
@ -411,11 +412,11 @@ For information about providing feedback on the documentation or update it yours
|
|||
|
||||
Select **Sign in /Create Docker ID** from the Docker Desktop menu to access your [Docker Hub](https://hub.docker.com/){: target="_blank" rel="noopener" class="_" } account. Once logged in, you can access your Docker Hub repositories and organizations directly from the Docker Desktop menu.
|
||||
|
||||
For more information, refer to the following [Docker Hub topics](../docker-hub/index.md){:target="_blank"
|
||||
For more information, refer to the following [Docker Hub topics](../../docker-hub/index.md){:target="_blank"
|
||||
class="_"}:
|
||||
|
||||
* [Organizations and Teams in Docker Hub](../docker-hub/orgs.md){:target="_blank" rel="noopener" class="_"}
|
||||
* [Builds](../docker-hub/builds/index.md){:target="_blank" rel="noopener" class="_"}
|
||||
* [Organizations and Teams in Docker Hub](../../docker-hub/orgs.md){:target="_blank" rel="noopener" class="_"}
|
||||
* [Builds](../../docker-hub/builds/index.md){:target="_blank" rel="noopener" class="_"}
|
||||
|
||||
### Two-factor authentication
|
||||
|
||||
|
|
@ -444,7 +445,7 @@ After you have successfully authenticated, you can access your organizations and
|
|||
walkthroughs and source code.
|
||||
|
||||
* For a summary of Docker command line interface (CLI) commands, see
|
||||
[Docker CLI Reference Guide](../engine/api/index.md){: target="_blank" rel="noopener" class="_"}.
|
||||
[Docker CLI Reference Guide](../../engine/api/index.md){: target="_blank" rel="noopener" class="_"}.
|
||||
|
||||
* Check out the blog post, [What’s New in Docker 17.06 Community Edition
|
||||
(CE)](https://blog.docker.com/2017/07/whats-new-docker-17-06-community-edition-ce/){: target="_blank" rel="noopener" class="_"}.
|
||||
|
|
@ -2,6 +2,8 @@
|
|||
description: How to install Docker Desktop on Mac
|
||||
keywords: mac, install, download, run, docker, local
|
||||
title: Install Docker Desktop on Mac
|
||||
redirect_from:
|
||||
- /docker-for-mac/install/
|
||||
---
|
||||
|
||||
Welcome to Docker Desktop for Mac. This page contains information about Docker Desktop for Mac system requirements, download URLs, installation instructions, and automatic updates.
|
||||
|
|
@ -57,8 +59,8 @@ Your Mac must meet the following requirements to successfully install Docker Des
|
|||
## What's included in the installer
|
||||
|
||||
The Docker Desktop installation includes
|
||||
[Docker Engine](../engine/index.md), Docker CLI client,
|
||||
[Docker Compose](../compose/index.md), [Docker Content Trust](../engine/security/trust/index.md), [Kubernetes](https://github.com/kubernetes/kubernetes/), and [Credential Helper](https://github.com/docker/docker-credential-helpers/).
|
||||
[Docker Engine](../../engine/index.md), Docker CLI client,
|
||||
[Docker Compose](../../compose/index.md), [Docker Content Trust](../../engine/security/trust/index.md), [Kubernetes](https://github.com/kubernetes/kubernetes/), and [Credential Helper](https://github.com/docker/docker-credential-helpers/).
|
||||
|
||||
## Install and run Docker Desktop on Mac
|
||||
|
||||
|
|
@ -104,7 +106,7 @@ To uninstall Docker Desktop from your Mac:
|
|||
>
|
||||
> Uninstalling Docker Desktop destroys Docker containers, images, volumes, and
|
||||
> other Docker related data local to the machine, and removes the files generated
|
||||
> by the application. Refer to the [back up and restore data](../desktop/backup-and-restore.md)
|
||||
> by the application. Refer to the [back up and restore data](../backup-and-restore.md)
|
||||
> section to learn how to preserve important data before uninstalling.
|
||||
|
||||
## Where to go next
|
||||
|
|
@ -113,8 +115,8 @@ To uninstall Docker Desktop from your Mac:
|
|||
- [Docker Desktop for Apple silicon](apple-silicon.md) for detailed information about Docker Desktop for Apple silicon.
|
||||
- [Troubleshooting](troubleshoot.md) describes common problems, workarounds, how
|
||||
to run and submit diagnostics, and submit issues.
|
||||
- [FAQs](../desktop/faqs.md) provide answers to frequently asked questions.
|
||||
- [FAQs](../faqs.md) provide answers to frequently asked questions.
|
||||
- [Release notes](release-notes.md) lists component updates, new features, and improvements associated with Docker Desktop releases.
|
||||
- [Get started with Docker](../get-started/index.md) provides a general Docker tutorial.
|
||||
* [Back up and restore data](../desktop/backup-and-restore.md) provides instructions
|
||||
- [Get started with Docker](../../get-started/index.md) provides a general Docker tutorial.
|
||||
* [Back up and restore data](../backup-and-restore.md) provides instructions
|
||||
on backing up and restoring data related to Docker.
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
description: Networking
|
||||
keywords: mac, networking
|
||||
redirect_from:
|
||||
- /docker-for-mac/networking/
|
||||
- /mackit/networking/
|
||||
title: Networking features in Docker Desktop for Mac
|
||||
---
|
||||
|
|
@ -130,5 +131,5 @@ container to random ports on the host.
|
|||
$ docker run -d -P --name webserver nginx
|
||||
```
|
||||
|
||||
See the [run command](../engine/reference/commandline/run.md) for more details on
|
||||
See the [run command](../../engine/reference/commandline/run.md) for more details on
|
||||
publish options used with `docker run`.
|
||||
|
|
@ -4,6 +4,8 @@ keywords: Docker Desktop for Mac, release notes
|
|||
title: Release notes for previous versions
|
||||
toc_min: 1
|
||||
toc_max: 2
|
||||
redirect_from:
|
||||
- /docker-for-mac/previous-versions/
|
||||
---
|
||||
|
||||
This page contains release notes for older versions of Docker Desktop for Mac.
|
||||
|
|
@ -248,7 +250,7 @@ Docker Desktop 2.2.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus
|
|||
### New
|
||||
|
||||
- **Docker Desktop Dashboard:** The new Docker Desktop **Dashboard** provides a user-friendly interface which enables you to interact with containers and applications, and manage the lifecycle of your applications directly from the UI. In addition, it allows you to access the logs, view container details, and monitor resource utilization to explore the container behavior.
|
||||
For detailed information about the new Dashboard UI, see [Docker Desktop Dashboard](../desktop/dashboard.md).
|
||||
For detailed information about the new Dashboard UI, see [Docker Desktop Dashboard](../dashboard.md).
|
||||
|
||||
- Introduced a new user interface for the Docker Desktop **Preferences** menu.
|
||||
- The Restart, Reset, and Uninstall options are now available on the **Troubleshoot** menu.
|
||||
|
|
@ -476,7 +478,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
- Linux Kernel 4.9.93 with CEPH, DRBD, RBD, MPLS_ROUTING and MPLS_IPTUNNEL enabled
|
||||
|
||||
* New
|
||||
- Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker For Mac Preferences and use kubectl commands as well as docker commands. See [https://docs.docker.com/docker-for-mac/kubernetes/](kubernetes.md)
|
||||
- Kubernetes Support. You can now run a single-node Kubernetes cluster from the "Kubernetes" Pane in Docker For Mac Preferences and use kubectl commands as well as docker commands. See [the Kubernetes section](../kubernetes.md)
|
||||
- Add an experimental SOCKS server to allow access to container networks, see [docker/for-mac#2670](https://github.com/docker/for-mac/issues/2670#issuecomment-372365274). Also see [docker/for-mac#2721](https://github.com/docker/for-mac/issues/2721)
|
||||
- Re-enable raw as the default disk format for users running macOS 10.13.4 and higher. Note this change only takes effect after a "reset to factory defaults" or "remove all data" (from the Whale menu -> Preferences -> Reset). Related to [docker/for-mac#2625](https://github.com/docker/for-mac/issues/2625)
|
||||
|
||||
|
|
@ -597,7 +599,7 @@ Docker Desktop Community 2.1.0.0 contains the following experimental features.
|
|||
- VM entirely built with Linuxkit
|
||||
- VM disk size can be changed in disk preferences. (See [docker/for-mac#1037](https://github.com/docker/for-mac/issues/1037))
|
||||
- For systems running APFS on SSD on High Sierra, use `raw` format VM disks by default. This improves disk throughput (from 320MiB/sec to 600MiB/sec in `dd` on a 2015 MacBook Pro) and disk space handling.
|
||||
Existing disks are kept in qcow format, if you want to switch to raw format you need to "Remove all data" or "Reset to factory defaults". See https://docs.docker.com/docker-for-mac/faqs/#disk-usage
|
||||
Existing disks are kept in qcow format, if you want to switch to raw format you need to "Remove all data" or "Reset to factory defaults". See [Disk utilization](space.md)
|
||||
- DNS name `docker.for.mac.host.internal` should be used instead of `docker.for.mac.localhost` (still valid) for host resolution from containers, since since there is an RFC banning the use of subdomains of localhost. See https://tools.ietf.org/html/draft-west-let-localhost-be-localhost-06.
|
||||
|
||||
* Bug fixes and minor changes
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
description: Change log / release notes for Docker Desktop Mac
|
||||
keywords: Docker Desktop for Mac, release notes
|
||||
redirect_from:
|
||||
- /docker-for-mac/release-notes/
|
||||
- /mackit/release-notes/
|
||||
- /docker-for-mac/edge-release-notes/
|
||||
title: Docker for Mac release notes
|
||||
|
|
@ -21,8 +22,8 @@ This page contains information about the new features, improvements, known issue
|
|||
|
||||
### New
|
||||
|
||||
- **Dev Environments**: You can now create a Dev Environment from your local Git repository. For more information, see [Start a Dev Environment from a local folder](../desktop/dev-environments.md#start-a-dev-environment-from-a-local-folder).
|
||||
- **Volume Management**: You can now sort volumes by the name, the date created, and the size of the volume. You can also search for specific volumes using the **Search** field. For more information, see [Explore volumes](../desktop/dashboard.md#explore-volumes).
|
||||
- **Dev Environments**: You can now create a Dev Environment from your local Git repository. For more information, see [Start a Dev Environment from a local folder](../dev-environments.md#start-a-dev-environment-from-a-local-folder).
|
||||
- **Volume Management**: You can now sort volumes by the name, the date created, and the size of the volume. You can also search for specific volumes using the **Search** field. For more information, see [Explore volumes](../dashboard.md#explore-volumes).
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
|
@ -50,7 +51,7 @@ This page contains information about the new features, improvements, known issue
|
|||
|
||||
### New
|
||||
|
||||
**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../desktop/dev-environments.md).
|
||||
**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../dev-environments.md).
|
||||
|
||||
|
||||
### Upgrades
|
||||
|
|
@ -82,9 +83,9 @@ This page contains information about the new features, improvements, known issue
|
|||
|
||||
### New
|
||||
|
||||
**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../desktop/dev-environments.md).
|
||||
**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../dev-environments.md).
|
||||
|
||||
**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
|
||||
**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
||||
|
|
@ -98,9 +99,9 @@ This page contains information about the new features, improvements, known issue
|
|||
|
||||
### New
|
||||
|
||||
**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../desktop/dev-environments.md).
|
||||
**Dev Environments Preview**: Dev Environments enable you to seamlessly collaborate with your team members without moving between Git branches to get your code onto your team members' machines. When using Dev Environments, you can share your in-progress work with your team members in just one click, and without having to deal with any merge conflicts. For more information and for instructions on how to use Dev Environments, see [Development Environments Preview](../dev-environments.md).
|
||||
|
||||
**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
|
||||
**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
|
@ -133,15 +134,15 @@ This page contains information about the new features, improvements, known issue
|
|||
|
||||
### New
|
||||
|
||||
**Volume Management**: Docker Desktop users can now create and delete volumes using the Docker Dashboard and also see which volumes are being used. For more information, see [Explore volumes](../desktop/dashboard.md#explore-volumes).
|
||||
**Volume Management**: Docker Desktop users can now create and delete volumes using the Docker Dashboard and also see which volumes are being used. For more information, see [Explore volumes](../dashboard.md#explore-volumes).
|
||||
|
||||
**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
|
||||
**Compose V2 beta**: Docker Desktop now includes the beta version of Compose V2, which supports the `docker compose` command as part of the Docker CLI. For more information, see [Compose V2 beta](../../compose/cli-command.md). While `docker-compose` is still supported and maintained, Compose V2 implementation relies directly on the compose-go bindings which are maintained as part of the specification. The compose command in the Docker CLI supports most of the `docker-compose` commands and flags. It is expected to be a drop-in replacement for `docker-compose`. There are a few remaining flags that have yet to be implemented, see the [docker-compose compatibility list](../../compose/cli-command-compatibility.md) for more information about the flags that are supported in the new compose command. If you run into any problems with Compose V2, you can easily switch back to Compose v1 by either by making changes in Docker Desktop **Experimental** Settings, or by running the command `docker-compose disable-v2`. Let us know your feedback on the new ‘compose’ command by creating an issue in the [Compose-CLI](https://github.com/docker/compose-cli/issues) GitHub repository.
|
||||
|
||||
**Skip Docker Desktop updates**: All users can now skip an update when they are prompted to install individual Docker Desktop releases. For more information, see [Docker Desktop updates](../docker-for-windows/install.md#updates).
|
||||
**Skip Docker Desktop updates**: All users can now skip an update when they are prompted to install individual Docker Desktop releases. For more information, see [Docker Desktop updates](../../docker-for-windows/install.md#updates).
|
||||
|
||||
### Deprecation
|
||||
|
||||
- Docker Desktop no longer installs Notary. You can now use [Docker Content Trust](../engine/security/trust.md) for image signing.
|
||||
- Docker Desktop no longer installs Notary. You can now use [Docker Content Trust](../../engine/security/trust/index.md) for image signing.
|
||||
|
||||
### Upgrades
|
||||
|
||||
|
|
@ -2,6 +2,8 @@
|
|||
description: Disk utilization
|
||||
keywords: mac, disk
|
||||
title: Disk utilization in Docker for Mac
|
||||
redirect_from:
|
||||
- /docker-for-mac/space/
|
||||
---
|
||||
|
||||
Docker Desktop stores Linux containers and images in a single, large "disk image" file in the Mac filesystem. This is different from Docker on Linux, which usually stores containers and images in the `/var/lib/docker` directory.
|
||||
|
|
@ -2,6 +2,7 @@
|
|||
description: Troubleshooting, logs, and known issues
|
||||
keywords: mac, troubleshooting, logs, issues
|
||||
redirect_from:
|
||||
- /docker-for-mac/troubleshoot/
|
||||
- /mackit/troubleshoot/
|
||||
title: Logs and troubleshooting
|
||||
toc_max: 2
|
||||
|
|
@ -27,7 +28,7 @@ The Troubleshoot page contains the following options:
|
|||
|
||||
* **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).
|
||||
|
||||
* **Reset Kubernetes cluster**: Select this option to delete all stacks and Kubernetes resources. For more information, see [Kubernetes](/docker-for-mac/index/#kubernetes).
|
||||
* **Reset Kubernetes cluster**: Select this option to delete all stacks and Kubernetes resources. For more information, see [Kubernetes](index.md#kubernetes).
|
||||
|
||||
* **Clean / Purge data**: This option resets all Docker data _without_ a
|
||||
reset to factory defaults. Selecting this option results in the loss of existing settings.
|
||||
|
|
@ -177,7 +178,7 @@ ways, and create reports.
|
|||
|
||||
#### View the Docker Daemon logs
|
||||
|
||||
Refer to the [read the logs](../config/daemon/index.md#read-the-logs) section
|
||||
Refer to the [read the logs](../../config/daemon/index.md#read-the-logs) section
|
||||
to learn how to view the Docker Daemon logs.
|
||||
|
||||
<a name="troubleshoot"></a>
|
||||
|
|
@ -207,7 +208,7 @@ For more about using client and server side certificates, see
|
|||
|
||||
If you are using mounted volumes and get runtime errors indicating an
|
||||
application file is not found, access to a volume mount is denied, or a service
|
||||
cannot start, such as when using [Docker Compose](../compose/gettingstarted.md),
|
||||
cannot start, such as when using [Docker Compose](../../compose/gettingstarted.md),
|
||||
you might need to enable [file sharing](index.md#file-sharing).
|
||||
|
||||
Volume mounting requires shared drives for projects that live outside of the
|
||||
|
|
@ -418,8 +419,8 @@ As a Team, you can get support for Docker Desktop for the number of machines equ
|
|||
|
||||
Docker Desktop is available for Mac and Windows. The supported version information can be found on the following pages:
|
||||
|
||||
* [Mac system requirements](../docker-for-mac/install.md#system-requirements)
|
||||
* [Windows system requirements](../docker-for-windows/install.md#system-requirements)
|
||||
* [Mac system requirements](install.md#system-requirements)
|
||||
* [Windows system requirements](../../docker-for-windows/install.md#system-requirements)
|
||||
|
||||
### Can I run Docker Desktop on Virtualized hardware?
|
||||
|
||||
|
|
@ -9,7 +9,7 @@ redirect_from:
|
|||
---
|
||||
|
||||
Docker Desktop is built using open source software. For information about the
|
||||
licensing, choose {: .inline}
|
||||
licensing, choose {: .inline}
|
||||
→ **About Docker Desktop** and then **Acknowledgements**.
|
||||
|
||||
Docker Desktop distributes some components that are licensed under the
|
||||
|
|
|
|||
|
|
@ -414,7 +414,7 @@ As a Team, you can get support for Docker Desktop for the number of machines equ
|
|||
Docker Desktop is available for Mac and Windows. The supported version information can be found on the following pages:
|
||||
|
||||
* [Windows system requirements](../docker-for-windows/install.md#system-requirements)
|
||||
* [Mac system requirements](../docker-for-mac/install.md#system-requirements)
|
||||
* [Mac system requirements](../desktop/mac/install.md#system-requirements)
|
||||
|
||||
### Can I run Docker Desktop on Virtualized hardware?
|
||||
|
||||
|
|
|
|||
|
|
@ -10,15 +10,15 @@ Every Engine release strives to be backward compatible with its predecessors,
|
|||
and interface stability is always a priority at Docker.
|
||||
|
||||
In all cases, feature removal is communicated three releases
|
||||
in advance and documented as part of the [deprecated features](deprecated.md)
|
||||
in advance and documented as part of the [deprecated features](/engine/deprecated/)
|
||||
page.
|
||||
|
||||
The following list compiles any updates to Docker Engine that created
|
||||
backwards-incompatibility for old versions of Docker tools.
|
||||
|
||||
> **Note**: In the case of your local environment, you should be updating your
|
||||
Docker Engine using [Docker Desktop for Mac](/docker-for-mac),
|
||||
[Docker Desktop for Windows](/docker-for-windows). That way all your tools stay
|
||||
Docker Engine using [Docker Desktop for Mac](../desktop/mac/index.md),
|
||||
[Docker Desktop for Windows](../docker-for-windows/index.md). That way all your tools stay
|
||||
in sync with Docker Engine.
|
||||
|
||||
## Engine 1.10
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ redirect_from:
|
|||
## Supported platforms
|
||||
|
||||
Docker Engine is available on a variety of [Linux platforms](#server),
|
||||
[macOS](../../docker-for-mac/install.md) and [Windows 10](../../docker-for-windows/install.md)
|
||||
[macOS](../../desktop/mac/install.md) and [Windows 10](../../docker-for-windows/install.md)
|
||||
through Docker Desktop, and as a [static binary installation](binaries.md). Find
|
||||
your preferred operating system below.
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ your preferred operating system below.
|
|||
|
||||
| Platform | x86_64 / amd64 | arm64 (Apple Silicon) |
|
||||
|:------------------------------------------------------------------|:------------------------------------------------:|:------------------------------------------------:|
|
||||
| [Docker Desktop for Mac (macOS)](../../docker-for-mac/install.md) | [{{ yes }}](../../docker-for-mac/install.md) | [{{ yes }}](../../docker-for-mac/install.md) |
|
||||
| [Docker Desktop for Mac (macOS)](../../desktop/mac/install.md) | [{{ yes }}](../../desktop/mac/install.md) | [{{ yes }}](../../desktop/mac/install.md) |
|
||||
| [Docker Desktop for Windows](../../docker-for-windows/install.md) | [{{ yes }}](../../docker-for-windows/install.md) | |
|
||||
|
||||
### Server
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ single-node and multi-node swarm scenarios on Linux machines.
|
|||
|
||||
#### Use Docker Desktop for Mac or Docker Desktop for Windows
|
||||
|
||||
Alternatively, install the latest [Docker Desktop for Mac](../../../docker-for-mac/index.md) or
|
||||
Alternatively, install the latest [Docker Desktop for Mac](../../../desktop/mac/index.md) or
|
||||
[Docker Desktop for Windows](../../../docker-for-windows/index.md) application on one
|
||||
computer. You can test both single-node and multi-node swarm from this computer,
|
||||
but you need to use Docker Machine to test the multi-node scenarios.
|
||||
|
|
|
|||
|
|
@ -25,9 +25,9 @@ section and choose the best installation path for you.
|
|||
<div class="col-sm-12 col-md-12 col-lg-4 block">
|
||||
<div class="component">
|
||||
<div class="component-icon">
|
||||
<a href="/docker-for-mac/install/"><img src="/images/apple_48.svg" alt="Docker Desktop for Mac" width="70" height="70"></a>
|
||||
<a href="/desktop/mac/install/"><img src="/images/apple_48.svg" alt="Docker Desktop for Mac" width="70" height="70"></a>
|
||||
</div>
|
||||
<h2 id="docker-for-mac"><a href="/docker-for-mac/install/">Docker Desktop for Mac</a></h2>
|
||||
<h2 id="docker-for-mac"><a href="/desktop/mac/install/">Docker Desktop for Mac</a></h2>
|
||||
<p>A native application using the macOS sandbox security model which delivers all Docker tools to your Mac.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ machine. If you do not have Docker installed, choose your preferred operating sy
|
|||
[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}
|
||||
[Linux](../engine/install/index.md){: .button .primary-btn}
|
||||
|
||||
For Docker Desktop installation instructions, see [Install Docker Desktop on Mac](../docker-for-mac/install.md) and [Install Docker Desktop on Windows](../docker-for-windows/install.md).
|
||||
For Docker Desktop installation instructions, see [Install Docker Desktop on Mac](../desktop/mac/install.md) and [Install Docker Desktop on Windows](../docker-for-windows/install.md).
|
||||
|
||||
{% include eula.md %}
|
||||
|
||||
|
|
@ -118,9 +118,8 @@ you a quick view of the containers running on your machine. The Docker Dashboard
|
|||
It gives you quick access to container logs, lets you get a shell inside the container, and lets you
|
||||
easily manage container lifecycle (stop, remove, etc.).
|
||||
|
||||
To access the dashboard, follow the instructions for either
|
||||
[Mac](../../docker-for-mac/dashboard/) or
|
||||
[Windows](../../docker-for-windows/dashboard/). If you open the dashboard
|
||||
To access the dashboard, follow the instructions in the
|
||||
[Docker Desktop product manual](../desktop/dashboard.md). If you open the dashboard
|
||||
now, you will see this tutorial running! The container name (`jolly_bouman` below) is a
|
||||
randomly created name. So, you'll most likely have a different name.
|
||||
|
||||
|
|
|
|||
|
|
@ -2,5 +2,5 @@
|
|||
title: How to run Docker Desktop on new Mac with Apple Silicon processors
|
||||
description: Instructions on enabling BuildKit
|
||||
keywords: mac, troubleshooting, apple, silicon, issues
|
||||
redirect_to: /docker-for-mac/apple-silicon/
|
||||
redirect_to: /desktop/mac/apple-silicon/
|
||||
---
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ page on GitHub.
|
|||
|
||||
## Prerequisite information
|
||||
|
||||
With the advent of [Docker Desktop for Mac](../docker-for-mac/index.md) and
|
||||
With the advent of [Docker Desktop for Mac](../desktop/mac/index.md) and
|
||||
[Docker Desktop for Windows](../docker-for-windows/index.md), we recommend that you use these for your
|
||||
primary Docker workflows. You can use these applications to run Docker natively
|
||||
on your local system without using Docker Machine at all.
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ point to a host called `default`, follow on-screen instructions to complete
|
|||
|
||||
Machine _was_ the _only_ way to run Docker on Mac or Windows previous to Docker
|
||||
v1.12. Starting with the beta program and Docker v1.12,
|
||||
[Docker Desktop for Mac](../docker-for-mac/index.md) and
|
||||
[Docker Desktop for Mac](../desktop/mac/index.md) and
|
||||
[Docker Desktop for Windows](../docker-for-windows/index.md) are available as native apps and the
|
||||
better choice for this use case on newer desktops and laptops. We encourage you
|
||||
to try out these new apps.
|
||||
|
|
@ -52,7 +52,7 @@ Docker Machine has these two broad use cases.
|
|||
|
||||
{: .white-bg}
|
||||
|
||||
If you work primarily on an older Mac or Windows laptop or desktop that doesn't meet the requirements for the new [Docker Desktop for Mac](../docker-for-mac/index.md) and [Docker Desktop for Windows](../docker-for-windows/index.md) apps, then you need Docker Machine to run Docker Engine locally.
|
||||
If you work primarily on an older Mac or Windows laptop or desktop that doesn't meet the requirements for the new [Docker Desktop for Mac](../desktop/mac/index.md) and [Docker Desktop for Windows](../docker-for-windows/index.md) apps, then you need Docker Machine to run Docker Engine locally.
|
||||
|
||||
* **I want to provision Docker hosts on remote systems**
|
||||
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@ To uninstall Docker Machine:
|
|||
|
||||
Removing machines is an optional step because there are cases where
|
||||
you might want to save and migrate existing machines to a
|
||||
[Docker for Mac](../docker-for-mac/index.md) or
|
||||
[Docker for Mac](../desktop/mac/index.md) or
|
||||
[Docker Desktop for Windows](../docker-for-windows/index.md) environment,
|
||||
for example.
|
||||
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ This is more secure than the insecure registry solution.
|
|||
3. Click **Finish**. Restart Docker.
|
||||
|
||||
- **Docker Desktop for Mac**: Follow the instructions in
|
||||
[Adding custom CA certificates](../docker-for-mac/index.md#add-tls-certificates){: target="_blank" rel="noopener" class="_"}.
|
||||
[Adding custom CA certificates](../desktop/mac/index.md#add-tls-certificates){: target="_blank" rel="noopener" class="_"}.
|
||||
Restart Docker.
|
||||
|
||||
- **Docker Desktop for Windows**: Follow the instructions in
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ features, improvements, known issues, and bug fixes in each release. You can
|
|||
find release notes for each component in the product manuals section. We suggest
|
||||
that you regularly visit the release notes to learn about updates.
|
||||
|
||||
- [Docker Engine](/engine/release-notes/)
|
||||
- [Docker Desktop for Mac](/docker-for-mac/release-notes/)
|
||||
- [Docker Desktop for Windows](/docker-for-windows/release-notes/)
|
||||
- [Docker Hub](/docker-hub/release-notes/)
|
||||
- [Docker Compose](/compose/release-notes/)
|
||||
- [Docker Engine](../engine/release-notes/index.md)
|
||||
- [Docker Desktop for Mac](../desktop/mac/release-notes.md)
|
||||
- [Docker Desktop for Windows](../docker-for-windows/release-notes.md)
|
||||
- [Docker Hub](../docker-hub/release-notes.md)
|
||||
- [Docker Compose](../compose/release-notes.md)
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ configure this app to use our SQL Server database, and then create a
|
|||
|
||||
This directory is the context of your docker-compose project. For
|
||||
[Docker Desktop for Windows](../docker-for-windows/index.md#file-sharing) and
|
||||
[Docker Desktop for Mac](../docker-for-mac/index.md#file-sharing), you
|
||||
[Docker Desktop for Mac](../desktop/mac/index.md#file-sharing), you
|
||||
need to set up file sharing for the volume that you need to map.
|
||||
|
||||
1. Within your directory, use the `dotnet:2.1-sdk` Docker image to generate a
|
||||
|
|
@ -176,7 +176,7 @@ configure this app to use our SQL Server database, and then create a
|
|||
|
||||
1. Make sure you allocate at least 2GB of memory to Docker Engine. Here is how
|
||||
to do it on
|
||||
[Docker Desktop for Mac](../docker-for-mac/index.md#advanced) and
|
||||
[Docker Desktop for Mac](../desktop/mac/index.md#advanced) and
|
||||
[Docker Desktop for Windows](../docker-for-windows/index.md#advanced).
|
||||
This is necessary to run the SQL Server on Linux container.
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ toc_max: 2
|
|||
>**Deprecated**
|
||||
>
|
||||
> Docker Toolbox has been deprecated and is no longer in active development. Please
|
||||
> use Docker Desktop instead. See [Docker Desktop for Mac](../docker-for-mac/index.md)
|
||||
> use Docker Desktop instead. See [Docker Desktop for Mac](../desktop/mac/index.md)
|
||||
> and [Docker Desktop for Windows](../docker-for-windows/index.md).
|
||||
{: .warning }
|
||||
|
||||
|
|
@ -68,7 +68,7 @@ To uninstall Docker Toolbox on Mac:
|
|||
|
||||
This step is optional because if you plan
|
||||
to re-install Docker Machine as a part
|
||||
of [Docker Desktop for Mac](../docker-for-mac/index.md), you can import and
|
||||
of [Docker Desktop for Mac](../desktop/mac/index.md), you can import and
|
||||
continue to manage those machines through Docker.
|
||||
|
||||
3. In your "Applications" folder, remove the "Docker" directory,
|
||||
|
|
|
|||
Loading…
Reference in New Issue