mirror of https://github.com/docker/docs.git
DDE: fix various broken links and links to images
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
406d70a4b9
commit
e238ba1815
|
@ -141,7 +141,7 @@ Parameter values and descriptions for environment configuration on Mac:
|
|||
| `swapMiB` | Specifies the amount of memory in MiB (1 MiB = 1048576 bytes) allocated for the swap file. |
|
||||
| `dataFolder` | Specifies the directory containing the VM disk files. |
|
||||
| `diskSizeMiB` | Specifies the amount of disk storage in MiB (1 MiB = 1048576 bytes) allocated for images and containers. |
|
||||
| `dockerDaemonOptions` | Overrides the options in the linux daemon config file. For more information, see [Docker engine reference](https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file). |
|
||||
| `dockerDaemonOptions` | Overrides the options in the linux daemon config file. For more information, see [Docker engine reference](/engine/reference/commandline/dockerd/#daemon-configuration-file). |
|
||||
| (End of `linuxVM` section.) | |
|
||||
| `kubernetes` | Parameters and settings related to kubernetes options - grouped together here for convenience. |
|
||||
| `enabled` | If `locked` is set to `true`, the Kubernetes cluster starts when Docker Desktop Enterprise is started. |
|
||||
|
@ -149,7 +149,7 @@ Parameter values and descriptions for environment configuration on Mac:
|
|||
| `podNetworkCIDR` | This is currently unimplemented. `locked` must be set to true. |
|
||||
| `serviceCIDR` | This is currently unimplemented. `locked` must be set to true. |
|
||||
| (End of `kubernetes` section.) | |
|
||||
|`template`|Parameters and settings related to Docker Template and Application Designer - grouped together in this example for convenience. For more information, see [`Docker template config`](/engine/reference/commandline/template_config/).|
|
||||
|`template`|Parameters and settings related to Docker Template and Application Designer - grouped together in this example for convenience. |
|
||||
|`defaultOrg`| Specifies the default organization to be used in Docker Template and Docker Application Designer. If `locked` is set to `true`, the Kubernetes cluster starts when Docker Desktop Enterprise is started. |
|
||||
|`defaultRegistry`|Specifies the default registry to be used in Docker Template and Application Designer.|
|
||||
|`repositories`|Lists the repositories that are allowed.|
|
||||
|
|
|
@ -185,10 +185,10 @@ Parameter values and descriptions for environment configuration on Windows:
|
|||
| `vpnkitCIDR` | Specifies the subnet used for VPNKit networking and drive sharing. The chosen subnet must not conflict with other resources on your network. |
|
||||
| `useDnsForwarder` | If `value` is set to `true`, this automatically determines the upstream DNS servers based on the host's network adapters. |
|
||||
| `dns` | If `value` for `useDnsForwarder` is set to `false`, the Linux VM uses the server information in this `value` setting for DNS resolution. |
|
||||
| `dockerDaemonOptions` | Overrides the options in the Linux daemon config file. For more information, see [Docker engine reference](https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file). |
|
||||
| `dockerDaemonOptions` | Overrides the options in the Linux daemon config file. For more information, see [Docker engine reference](/engine/reference/commandline/dockerd/#daemon-configuration-file). |
|
||||
| (End of `linuxVM` section.) | |
|
||||
| `windows` | Parameters and settings related to the Windows daemon-related options - grouped together in this example for convenience. |
|
||||
| `dockerDaemonOptions` | Overrides the options in the Windows daemon config file. For more information, see [Docker engine reference](https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file). |
|
||||
| `dockerDaemonOptions` | Overrides the options in the Windows daemon config file. For more information, see [Docker engine reference](/engine/reference/commandline/dockerd/#daemon-configuration-file). |
|
||||
| (End of `windows` section.) | |
|
||||
| `kubernetes` | Parameters and settings related to kubernetes options - grouped together here for convenience. |
|
||||
| `enabled` | If `locked` is set to `true`, the Kubernetes cluster starts when Docker Desktop Enterprise is started. |
|
||||
|
@ -196,7 +196,7 @@ Parameter values and descriptions for environment configuration on Windows:
|
|||
| `podNetworkCIDR` | This is currently unimplemented. `locked` must be set to true. |
|
||||
| `serviceCIDR` | This is currently unimplemented. `locked` must be set to true. |
|
||||
| (End of `kubernetes` section.) | |
|
||||
|`template`|Parameters and settings related to Docker Template and Application Designer - grouped together in this example for convenience. For more information, see [`Docker template config`](/engine/reference/commandline/template_config/).|
|
||||
|`template`|Parameters and settings related to Docker Template and Application Designer - grouped together in this example for convenience. |
|
||||
|`defaultOrg`| Specifies the default organization to be used in Docker Template and Docker Application Designer. If `locked` is set to `true`, the Kubernetes cluster starts when Docker Desktop Enterprise is started. |
|
||||
|`defaultRegistry`|Specifies the default registry to be used in Docker Template and Application Designer.|
|
||||
|`repositories`|Lists the repositories that are allowed.|
|
||||
|
|
|
@ -34,7 +34,7 @@ Double-click the `.pkg` file to begin the installation and follow the on-screen
|
|||
|
||||
Mac administrators can use the command line option `\$ sudo installer -pkg Docker.pkg -target /` for fine tuning and mass installation. After running this command, you can start Docker Desktop from the Applications folder on each machine.
|
||||
|
||||
Administrators can configure additional settings by modifying the administrator configuration file. For more information, see [Configure Desktop Enterprise for Mac](/desktop/enterprise/admin/configure/mac-admin).
|
||||
Administrators can configure additional settings by modifying the administrator configuration file. For more information, see [Configure Desktop Enterprise for Mac](../configure/mac-admin.md).
|
||||
|
||||
## License file
|
||||
|
||||
|
|
|
@ -12,11 +12,11 @@ The Application Designer helps Docker developers quickly create new
|
|||
Docker apps using a library of templates. To start the Application
|
||||
Designer, select the **Design new application** menu entry.
|
||||
|
||||

|
||||

|
||||
|
||||
The list of available templates is provided:
|
||||
|
||||

|
||||

|
||||
|
||||
After selecting a template, you can then customize your application, For
|
||||
example, if you select **Flask / NGINX / MySQL**, you can then
|
||||
|
@ -25,19 +25,19 @@ example, if you select **Flask / NGINX / MySQL**, you can then
|
|||
|
||||
- choose different external ports:
|
||||
|
||||

|
||||

|
||||
|
||||
You can then name your application and customize the disk location:
|
||||
|
||||

|
||||

|
||||
|
||||
When you select **Assemble**, your application is created.
|
||||
|
||||

|
||||

|
||||
|
||||
Once assembled, the following screen allows you to run the application. Select **Run application** to pull the images and start the containers:
|
||||
|
||||

|
||||

|
||||
|
||||
Use the corresponding buttons to start and stop your application. Select **Open in Finder** on Mac or **Open in Explorer** on Windows to
|
||||
view application files on disk. Select **Open in Visual Studio Code** to open files with an editor. Note that debug logs from the application are displayed in the lower part of the Application Designer
|
||||
|
|
|
@ -8,9 +8,9 @@ redirect_from:
|
|||
|
||||
Welcome to Docker Desktop Enterprise. This page contains information about the Docker Desktop Enterprise (DDE) release. For information about Docker Desktop Community, see:
|
||||
|
||||
- [Docker Desktop for Mac (Community)](/docker-for-mac/){: target="_blank" rel="noopener" class="_"}
|
||||
- [Docker Desktop for Mac (Community)](../../docker-for-mac/index.md)
|
||||
|
||||
- [Docker Desktop for Windows (Community)](/docker-for-windows/){: target="_blank" rel="noopener" class="_"}
|
||||
- [Docker Desktop for Windows (Community)](../../docker-for-windows/index.md)
|
||||
|
||||
Docker Desktop Enterprise provides local development, testing, and building of Docker applications on Mac and Windows. With work performed locally, developers can leverage a rapid feedback loop before pushing code or Docker images to shared servers / continuous integration infrastructure.
|
||||
|
||||
|
|
|
@ -12,10 +12,10 @@ This page contains information about the new features, improvements, known issue
|
|||
|
||||
For information on system requirements, installation, and download, see:
|
||||
|
||||
- [Install Docker Desktop Enterprise on Mac](/desktop/enterprise/admin/install/mac)
|
||||
- [Install Docker Desktop Enterprise on Windows](/desktop/enterprise/admin/install/windows)
|
||||
- [Install Docker Desktop Enterprise on Mac](admin/install/mac.md)
|
||||
- [Install Docker Desktop Enterprise on Windows](admin/install/windows.md)
|
||||
|
||||
For Docker Enterprise Engine release notes, see [Docker Engine release notes](/engine/release-notes).
|
||||
For Docker Engine release notes, see [Docker Engine release notes](../../engine/release-notes/index.md).
|
||||
|
||||
## Version 2.3.0.0
|
||||
2020-04-22
|
||||
|
@ -23,8 +23,8 @@ For Docker Enterprise Engine release notes, see [Docker Engine release notes](/e
|
|||
Docker Desktop Enterprise 2.3.0.0 contains a Kubernetes upgrade. Note that your local Kubernetes cluster in Version Pack 3.0 will be reset after installing this version.
|
||||
|
||||
This version includes all the bug fixes and minor changes between Docker Desktop Community versions 2.1.0.1 and 2.3.0.0. For details see:
|
||||
- [Docker Desktop Community release notes on Mac](/docker-for-mac/release-notes)
|
||||
- [Docker Desktop Community release notes on Windows](/docker-for-windows/release-notes)
|
||||
- [Docker Desktop Community release notes on Mac](../../docker-for-mac/release-notes.md)
|
||||
- [Docker Desktop Community release notes on Windows](../../docker-for-windows/release-notes.md)
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
||||
|
@ -37,8 +37,8 @@ This version includes all the bug fixes and minor changes between Docker Desktop
|
|||
Docker Desktop Enterprise 2.3.0.0 contains a change in the configuration file format.
|
||||
|
||||
For more information, see:
|
||||
- [Update Docker Desktop Enterprise configuration file from version 1 to 2 on Mac](/desktop/enterprise/admin/configure/mac-admin/#from-version-1-to-2)
|
||||
- [Update Docker Desktop Enterprise configuration file from version 1 to 2 on Windows](/desktop/enterprise/admin/configure/windows-admin/#from-version-1-to-2)
|
||||
- [Update Docker Desktop Enterprise configuration file from version 1 to 2 on Mac](admin/configure/mac-admin.md#from-version-1-to-2)
|
||||
- [Update Docker Desktop Enterprise configuration file from version 1 to 2 on Windows](admin/configure/windows-admin.md#from-version-1-to-2)
|
||||
|
||||
## Version 2.1.0.9
|
||||
2020-03-13
|
||||
|
@ -54,10 +54,10 @@ Docker Desktop Enterprise 2.1.0.8 contains a Kubernetes upgrade. Note that your
|
|||
|
||||
### Upgrades
|
||||
|
||||
- [Docker 19.03.5](https://docs.docker.com/engine/release-notes/#19035/) in Version Pack Enterprise 3.0
|
||||
- [Docker 19.03.5](/engine/release-notes/#19035) in Version Pack Enterprise 3.0
|
||||
- [Kubernetes 1.14.8](https://github.com/kubernetes/kubernetes/releases/tag/v1.14.8) in Version Pack Enterprise 3.0
|
||||
- [Docker 18.09.11](https://docs.docker.com/engine/release-notes/#180911) in Version Pack Enterprise 2.1
|
||||
- [Docker 17.06.2-ee-25](https://docs.docker.com/engine/release-notes/#17062-ee-25) in Version Pack Enterprise 2.0
|
||||
- [Docker 18.09.11](/engine/release-notes/#180911) in Version Pack Enterprise 2.1
|
||||
- [Docker 17.06.2-ee-25](/engine/release-notes/#17062-ee-25) in Version Pack Enterprise 2.0
|
||||
- [Go 1.12.13](https://golang.org/doc/devel/release.html#go1.12)
|
||||
|
||||
## Version 2.1.0.7
|
||||
|
@ -65,7 +65,7 @@ Docker Desktop Enterprise 2.1.0.8 contains a Kubernetes upgrade. Note that your
|
|||
|
||||
### Upgrades
|
||||
|
||||
[Docker 19.03.4](https://docs.docker.com/engine/release-notes/) in Version Pack Enterprise 3.0
|
||||
[Docker 19.03.4](/engine/release-notes/) in Version Pack Enterprise 3.0
|
||||
|
||||
## Version 2.1.0.6
|
||||
2019-10-08
|
||||
|
@ -74,7 +74,7 @@ Docker Desktop Enterprise 2.1.0.6 contains a Kubernetes upgrade. Note that your
|
|||
|
||||
### Upgrades
|
||||
|
||||
- [Docker 19.03.3](https://docs.docker.com/engine/release-notes/) in Version Pack Enterprise 3.0
|
||||
- [Docker 19.03.3](/engine/release-notes/) in Version Pack Enterprise 3.0
|
||||
- [Kubernetes 1.14.7](https://github.com/kubernetes/kubernetes/releases/tag/v1.14.7) in Version Pack Enterprise 3.0
|
||||
- [Go 1.12.10](https://github.com/golang/go/issues?q=milestone%3AGo1.12.10+label%3ACherryPickApproved)
|
||||
- Application Designer 0.1.8
|
||||
|
@ -97,7 +97,7 @@ Docker Desktop Enterprise 2.1.0.3 contains a Kubernetes upgrade. Note that your
|
|||
|
||||
### Upgrades
|
||||
|
||||
- [Docker 19.03.2](https://docs.docker.com/engine/release-notes/) in Version Pack Enterprise 3.0
|
||||
- [Docker 19.03.2](/engine/release-notes/) in Version Pack Enterprise 3.0
|
||||
- [Kubernetes 1.14.6](https://github.com/kubernetes/kubernetes/releases/tag/v1.14.6) in Version Pack Enterprise 3.0
|
||||
- [Go 1.12.9](https://github.com/golang/go/issues?q=milestone%3AGo1.12.9+label%3ACherryPickApproved) in Version Pack Enterprise 3.0
|
||||
- [Qemu 4.1.0](https://github.com/docker/binfmt) to cross-compile ARM devices
|
||||
|
@ -115,7 +115,7 @@ Docker Desktop Enterprise 2.1.0.3 contains a Kubernetes upgrade. Note that your
|
|||
|
||||
### Upgrades
|
||||
|
||||
- [Docker 19.03.1](https://docs.docker.com/engine/release-notes/) in Version Pack Enterprise 3.0.
|
||||
- [Docker 19.03.1](/engine/release-notes/) in Version Pack Enterprise 3.0.
|
||||
|
||||
## Version 2.1.0.1
|
||||
2019-07-22
|
||||
|
@ -124,14 +124,14 @@ Docker Desktop Enterprise 2.1.0.1 contains a Kubernetes upgrade. Note that your
|
|||
|
||||
### Upgrades
|
||||
|
||||
- [Docker 19.03.0](https://docs.docker.com/engine/release-notes/) in Version Pack Enterprise 3.0
|
||||
- [Docker 19.03.0](/engine/release-notes/) in Version Pack Enterprise 3.0
|
||||
- [Kubernetes 1.14.3](https://github.com/kubernetes/kubernetes/releases/tag/v1.14.3) in Version Pack Enterprise 3.0
|
||||
- [Compose on Kubernetes 0.4.23](https://github.com/docker/compose-on-kubernetes/releases/tag/v0.4.23) in Version Pack Enterprise 3.0
|
||||
- [Docker Compose 1.24.1](https://github.com/docker/compose/releases/tag/1.24.1)
|
||||
- [Docker 18.09.8](https://docs.docker.com/engine/release-notes/) in Version Pack Enterprise 2.1
|
||||
- [Docker 17.06.2-ee-23](https://docs.docker.com/engine/release-notes/) in Version Pack Enterprise 2.0
|
||||
- [Docker 18.09.8](/engine/release-notes/) in Version Pack Enterprise 2.1
|
||||
- [Docker 17.06.2-ee-23](/engine/release-notes/) in Version Pack Enterprise 2.0
|
||||
- [Docker Credential Helpers 0.6.3](https://github.com/docker/docker-credential-helpers/releases/tag/v0.6.3)
|
||||
- [Application Designer 0.1.4](/desktop/enterprise/app-designer/)
|
||||
- [Application Designer 0.1.4](app-designer.md)
|
||||
|
||||
### Known issue
|
||||
|
||||
|
@ -146,7 +146,7 @@ Workaround: After signing back into Windows, when Docker Desktop has started, ri
|
|||
|
||||
### Upgrades
|
||||
|
||||
- [Docker 19.03.0-rc2](https://docs.docker.com/engine/release-notes/) in Version Pack Enterprise 3.0
|
||||
- [Docker 19.03.0-rc2](/engine/release-notes/) in Version Pack Enterprise 3.0
|
||||
- Application Designer 0.1.3
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
@ -162,7 +162,7 @@ Workaround: After signing back into Windows, when Docker Desktop has started, ri
|
|||
|
||||
### Upgrades
|
||||
|
||||
- [Docker 19.03.0-rc1](https://docs.docker.com/engine/release-notes/) in Enterprise 3.0 version pack
|
||||
- [Docker 19.03.0-rc1](/engine/release-notes/) in Enterprise 3.0 version pack
|
||||
- Application Designer 0.1.2
|
||||
- [Qemu 4.0.0](https://github.com/docker/binfmt) to cross-compile ARM devices
|
||||
|
||||
|
@ -180,8 +180,8 @@ Workaround: After signing back into Windows, when Docker Desktop has started, ri
|
|||
|
||||
### Upgrades
|
||||
|
||||
- [Docker 19.03.0-beta4](https://docs.docker.com/engine/release-notes/) in Enterprise 3.0 version pack
|
||||
- [Docker 18.09.6](https://docs.docker.com/engine/release-notes/), [Kubernetes 1.11.10](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#v11110) in Enterprise 2.1 version pack
|
||||
- [Docker 19.03.0-beta4](/engine/release-notes/) in Enterprise 3.0 version pack
|
||||
- [Docker 18.09.6](/engine/release-notes/), [Kubernetes 1.11.10](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#v11110) in Enterprise 2.1 version pack
|
||||
- [LinuxKit v0.7](https://github.com/linuxkit/linuxkit/releases/tag/v0.7)
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
@ -201,7 +201,7 @@ Workaround: After signing back into Windows, when Docker Desktop has started, ri
|
|||
|
||||
### Upgrades
|
||||
|
||||
- [Docker Engine 19.03.0-beta2](https://docs.docker.com/engine/release-notes/) for Version Pack Enterprise 3.0.
|
||||
- [Docker Engine 19.03.0-beta2](/engine/release-notes/) for Version Pack Enterprise 3.0.
|
||||
|
||||
## Version 2.0.0.2
|
||||
2019-04-19
|
||||
|
@ -210,15 +210,15 @@ Workaround: After signing back into Windows, when Docker Desktop has started, ri
|
|||
|
||||
### New
|
||||
|
||||
- Version Pack Enterprise 3.0 with [Docker Engine 19.03.0-beta1](https://docs.docker.com/engine/release-notes/) and [Kubernetes 1.14.1](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.14.md#changelog-since-v1141)
|
||||
- Version Pack Enterprise 3.0 with [Docker Engine 19.03.0-beta1](/engine/release-notes/) and [Kubernetes 1.14.1](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.14.md#changelog-since-v1141)
|
||||
|
||||
- Application Designer now includes new templates for AngularJS and VueJS.
|
||||
|
||||
### Upgrades
|
||||
|
||||
- [Docker Compose 1.24.0](https://github.com/docker/compose/releases/tag/1.24.0)
|
||||
- [Docker Engine 18.09.5](https://docs.docker.com/engine/release-notes/), [Kubernetes 1.11.7](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#v1117) and [Compose on Kubernetes 0.4.22](https://github.com/docker/compose-on-kubernetes/releases/tag/v0.4.22) for Version Pack Enterprise 2.1
|
||||
- [Docker Engine 17.06.2-ee-21](https://docs.docker.com/engine/release-notes/) for Version Pack Enterprise 2.0
|
||||
- [Docker Engine 18.09.5](/engine/release-notes/), [Kubernetes 1.11.7](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#v1117) and [Compose on Kubernetes 0.4.22](https://github.com/docker/compose-on-kubernetes/releases/tag/v0.4.22) for Version Pack Enterprise 2.1
|
||||
- [Docker Engine 17.06.2-ee-21](/engine/release-notes/) for Version Pack Enterprise 2.0
|
||||
|
||||
### Bug fixes and minor changes
|
||||
|
||||
|
|
|
@ -77,4 +77,4 @@ ways, and create reports.
|
|||
|
||||
### Additional Docker Desktop Enterprise troubleshooting topics
|
||||
|
||||
You can also find additional information about various troubleshooting topics in the [Docker Desktop for Mac community](https://docs.docker.com/docker-for-mac/troubleshoot/) documentation.
|
||||
You can also find additional information about various troubleshooting topics in the [Docker Desktop for Mac community](../../../docker-for-mac/troubleshoot.md) documentation.
|
||||
|
|
|
@ -40,4 +40,4 @@ The name of the diagnostics file is displayed next to “Diagnostics Bundle”
|
|||
|
||||
### Additional Docker Desktop Enterprise troubleshooting topics
|
||||
|
||||
You can also find additional information about various troubleshooting topics in the [Docker Desktop for Windows community](https://docs.docker.com/docker-for-windows/troubleshoot/) documentation.
|
||||
You can also find additional information about various troubleshooting topics in the [Docker Desktop for Windows community](../../../docker-for-windows/troubleshoot.md) documentation.
|
||||
|
|
|
@ -119,7 +119,7 @@ File sharing settings include the following options:
|
|||
|
||||
For more information, see:
|
||||
|
||||
- [Volume mounting requires file sharing for any project directories outside of `/Users`](https://docs.docker.com/docker-for-mac/troubleshoot/#volume-mounting-requires-file-sharing-for-any-project-directories-outside-of-users).
|
||||
- [Volume mounting requires file sharing for any project directories outside of `/Users`](../../../docker-for-mac/troubleshoot.md#volume-mounting-requires-file-sharing-for-any-project-directories-outside-of-users).
|
||||
|
||||
#### Disk
|
||||
|
||||
|
@ -179,7 +179,7 @@ You can see from the above output that the `HTTP_PROXY`, `http_proxy`, and
|
|||
`no_proxy` environment variables are set. When your proxy configuration changes,
|
||||
Docker restarts automatically to pick up the new settings. If you have
|
||||
containers that you wish to keep running across restarts, you should consider
|
||||
using [restart policies](https://docs.docker.com/engine/reference/run/#restart-policies---restart).
|
||||
using [restart policies](/engine/reference/run/#restart-policies---restart).
|
||||
|
||||
#### Daemon
|
||||
|
||||
|
@ -209,20 +209,21 @@ true
|
|||
|
||||
##### Insecure registries
|
||||
|
||||
You can set up a custom and insecure [registry](https://docs.docker.com/registry/introduction) to store your public or private images (instead of
|
||||
using [Docker Hub](https://hub.docker.com/). Add URLs for
|
||||
your insecure registries and registry mirrors on which to host your images.
|
||||
You can set up a custom and insecure [registry](../../../registry/introduction.md)
|
||||
to store your public or private images (instead of using [Docker Hub](https://hub.docker.com/).
|
||||
Add URLs for your insecure registries and registry mirrors on which to host your
|
||||
images.
|
||||
|
||||
For more information, see:
|
||||
|
||||
- [How do I add custom CA certificates?](https://docs.docker.com/docker-for-mac/faqs/#how-do-i-add-custom-ca-certificates)
|
||||
- [How do I add custom CA certificates?](../../../docker-for-mac/faqs.md#how-do-i-add-custom-ca-certificates)
|
||||
|
||||
- [How do I add client certificates?](https://docs.docker.com/docker-for-mac/faqs/#how-do-i-add-client-certificates)
|
||||
- [How do I add client certificates?](../../../docker-for-mac/faqs.md#how-do-i-add-client-certificates)
|
||||
|
||||
##### Daemon configuration file
|
||||
|
||||
Click the **Advanced** tab to configure the daemon from the JSON file. For a
|
||||
full list of options, see the Docker Engine [dockerd command line reference](https://docs.docker.com/engine/reference/commandline/dockerd).
|
||||
full list of options, see the Docker Engine [dockerd command line reference](/engine/reference/commandline/dockerd/).
|
||||
|
||||
Click **Apply & Restart** to save your settings and reboot Docker. To cancel
|
||||
changes, click another preference tab, then choose to discard or not apply
|
||||
|
@ -248,7 +249,7 @@ $ kubectl config use-context docker-desktop
|
|||
If you installed `kubectl` with Homebrew, or by some other method, and
|
||||
experience conflicts, remove `/usr/local/bin/kubectl`.
|
||||
|
||||
To enable Kubernetes support and install a standalone instance of Kubernetes running as a Docker container, select **Enable Kubernetes**, choose the [default orchestrator](https://docs.docker.com/docker-for-mac/kubernetes/#override-the-default-orchestrator) and click the **Apply** button.
|
||||
To enable Kubernetes support and install a standalone instance of Kubernetes running as a Docker container, select **Enable Kubernetes**, choose the [default orchestrator](../../../docker-for-mac/kubernetes.md#override-the-default-orchestrator) and click the **Apply** button.
|
||||
|
||||

|
||||
|
||||
|
@ -269,7 +270,7 @@ To disable Kubernetes support at any time, clear the **Enable Kubernetes** check
|
|||
Kubernetes containers are stopped and removed, and the
|
||||
`/usr/local/bin/kubectl` command is removed.
|
||||
|
||||
For more information about using the Kubernetes integration with Docker Desktop Enterprise, see [Deploy on Kubernetes](https://docs.docker.com/docker-for-mac/kubernetes).
|
||||
For more information about using the Kubernetes integration with Docker Desktop Enterprise, see [Deploy on Kubernetes](../../../docker-for-mac/kubernetes.md).
|
||||
|
||||
#### Reset
|
||||
|
||||
|
@ -279,21 +280,21 @@ Click on the Docker icon from the menu bar and then **Preferences**. Click **Res
|
|||
|
||||
### Troubleshoot
|
||||
|
||||
The **Diagnose and Feedback** option allows you troubleshoot any issues you may be experiencing with Docker Desktop Enterprise. For more information, see [Troubleshoot DDE issues on Mac](/desktop/enterprise/troubleshoot/mac-issues).
|
||||
The **Diagnose and Feedback** option allows you troubleshoot any issues you may be experiencing with Docker Desktop Enterprise. For more information, see [Troubleshoot DDE issues on Mac](../troubleshoot/mac-issues.md).
|
||||
|
||||
### Design new application
|
||||
|
||||
Select this option to open the Application Designer user interface. Application Designer provides a library of application and service templates to help Docker developers quickly create new Docker applications. For more information, see [Application Designer](/desktop/enterprise/app-designer).
|
||||
Select this option to open the Application Designer user interface. Application Designer provides a library of application and service templates to help Docker developers quickly create new Docker applications. For more information, see [Application Designer](../app-designer.md).
|
||||
|
||||
### Docker Hub
|
||||
|
||||
Select **Sign in /Create Docker ID** from the Docker Desktop Enterprise menu to access your [Docker Hub](https://hub.docker.com/) account. Once logged in, select **Repositories** on the Docker Desktop Enterprise menu to access your Docker Hub repositories directly.
|
||||
|
||||
See the following [Docker Hub topics](https://docs.docker.com/docker-hub/) to learn more:
|
||||
See the following [Docker Hub topics](../../../docker-hub/index.md) to learn more:
|
||||
|
||||
- [Organizations and Teams in Docker Hub](https://docs.docker.com/docker-hub/orgs/)
|
||||
- [Organizations and Teams in Docker Hub](../../../docker-hub/orgs.md)
|
||||
|
||||
- [Builds and Images](https://docs.docker.com/docker-hub/official_images/)
|
||||
- [Builds and Images](../../../docker-hub/official_images.md)
|
||||
|
||||
### Add TLS certificates
|
||||
|
||||
|
@ -388,7 +389,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](https://docs.docker.com/engine/security/certificates) in the Docker Engine
|
||||
how to set the client TLS certificate for verification, see [Verify repository client with certificates](../../../engine/security/certificates.md) in the Docker Engine
|
||||
topics.
|
||||
|
||||
### Install shell completion
|
||||
|
|
|
@ -206,13 +206,10 @@ Tips on shared drives, permissions, and volume mounts:
|
|||
- Shared drives are only required for mounting volumes in [Linux containers](#switch-between-windows-and-linux-containers), not for Windows containers. For Linux containers, you need to share the drive where the Dockerfile and volume are located. If you get errors such as `file not found` or `cannot start service` you may need to enable shared drives. See [Volume mounting requires shared drives for Linux containers](/docker-for-windows/troubleshoot#volume-mounting-requires-shared-drives-for-linux-containers).
|
||||
|
||||
- If possible, avoid volume mounts from the Windows host, and instead mount on
|
||||
the Linux VM, or use a [data volume](https://docs.docker.com/storage/volumes/) (named volume) or [data container](https://docs.docker.com/storage/volumes/). There are a number of issues with using host-mounted volumes and network paths
|
||||
for database files. See [Volume mounts from host paths use a nobrl option to override database locking](https://docs.docker.com/docker-for-windows/troubleshoot/#volume-mounts-from-host-paths-use-a-nobrl-option-to-override-database-locking).
|
||||
the Linux VM, or use a [data volume](../../../storage/volumes.md) (named volume) or [data container](../../../storage/volumes.md).
|
||||
|
||||
- Docker Desktop sets permissions to read/write/execute for users, groups and others [0777 or a+rwx](http://permissions-calculator.org/decode/0777/).
|
||||
This is not configurable. See [Permissions errors on data directories for shared volumes](https://docs.docker.com/docker-for-windows/troubleshoot/#permissions-errors-on-data-directories-for-shared-volumes).
|
||||
|
||||
- Ensure the domain user has access to shared drives, as described in [Verify domain user has permissions for shared drives](https://docs.docker.com/docker-for-windows/troubleshoot/#verify-domain-user-has-permissions-for-shared-drives-volumes).
|
||||
This is not configurable. See [Permissions errors on data directories for shared volumes](../../../docker-for-windows/troubleshoot.md#permissions-errors-on-data-directories-for-shared-volumes).
|
||||
|
||||
##### Firewall rules for shared drives
|
||||
|
||||
|
@ -271,7 +268,7 @@ You can configure Docker Desktop Enterprise networking to work on a virtual priv
|
|||
> `docker` commands that pull images from Docker Hub that are not already
|
||||
> downloaded, such as a first time run of `docker run hello-world`. If you
|
||||
> encounter this, reset the DNS server to use the Google DNS fixed address:
|
||||
> `8.8.8.8`. For more information, see [Networking issues](https://docs.docker.com/docker-for-windows/troubleshoot/#networking-issues) in Troubleshooting.
|
||||
> `8.8.8.8`. For more information, see [Networking issues](../../../docker-for-windows/troubleshoot.md#networking-issues) in Troubleshooting.
|
||||
|
||||
Updating these settings requires a reconfiguration and reboot of the Linux VM.
|
||||
|
||||
|
@ -302,7 +299,7 @@ In the output above, the `HTTP_PROXY`, `http_proxy`, and `no_proxy` environment
|
|||
variables are set. When your proxy configuration changes, Docker restarts
|
||||
automatically to pick up the new settings. If you have containers that you wish
|
||||
to keep running across restarts, you should consider using
|
||||
[restart policies](https://docs.docker.com/engine/reference/run/#restart-policies---restart).
|
||||
[restart policies](/engine/reference/run/#restart-policies---restart).
|
||||
|
||||
#### Daemon
|
||||
|
||||
|
@ -350,34 +347,34 @@ Server:
|
|||
|
||||
##### Insecure registries
|
||||
|
||||
You can set up your own [registries](https://docs.docker.com/registry/introduction) on the **Basic** Daemon settings.
|
||||
You can set up your own [registries](../../../registry/index.md) on the **Basic** Daemon settings.
|
||||
|
||||
Normally, you store public or private images in [Docker Hub](https://hub.docker.com/). Here, you
|
||||
can use Docker to set up your own [insecure registry](https://docs.docker.com/registry/insecure/).
|
||||
can use Docker to set up your own [insecure registry](../../../registry/insecure.md).
|
||||
Simply add URLs for insecure registries and registry mirrors on which to host your images.
|
||||
|
||||
For more information, see:
|
||||
|
||||
- [How do I add custom CA certificates?](https://docs.docker.com/docker-for-windows/faqs/#how-do-i-add-custom-ca-certificates)
|
||||
- [How do I add custom CA certificates?](../../../docker-for-windows/faqs.md#how-do-i-add-custom-ca-certificates)
|
||||
|
||||
- [How do I add client certificates?](https://docs.docker.com/docker-for-windows/faqs/#how-do-i-add-client-certificates)
|
||||
- [How do I add client certificates?](../../../docker-for-windows/faqs.md#how-do-i-add-client-certificates)
|
||||
|
||||
#### Daemon configuration file
|
||||
|
||||
The **Advanced** daemon settings provide the original option to directly edit
|
||||
the JSON configuration file for the [daemon](https://docs.docker.com/engine/reference/commandline/dockerd).
|
||||
the JSON configuration file for the [daemon](/engine/reference/commandline/dockerd/).
|
||||
|
||||
> Updating these settings requires a reconfiguration and reboot of the Linux VM.
|
||||
|
||||

|
||||
|
||||
For a full list of options on the Docker daemon, see [daemon](https://docs.docker.com/engine/reference/commandline/dockerd), and also sub-topics:
|
||||
For a full list of options on the Docker daemon, see [daemon](../../../engine/reference/commandline/dockerd/), and also sub-topics:
|
||||
|
||||
- [Daemon configuration file](https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file)
|
||||
- [Daemon configuration file](../../../engine/reference/commandline/dockerd/#daemon-configuration-file)
|
||||
|
||||
- [Linux configuration file](https://docs.docker.com/engine/reference/commandline/dockerd/#linux-configuration-file)
|
||||
- [Linux configuration file](../../../engine/reference/commandline/dockerd/#linux-configuration-file)
|
||||
|
||||
- [Windows configuration file](https://docs.docker.com/engine/reference/commandline/dockerd/#windows-configuration-file)
|
||||
- [Windows configuration file](../../../engine/reference/commandline/dockerd/#windows-configuration-file)
|
||||
|
||||
#### Kubernetes
|
||||
|
||||
|
@ -419,7 +416,7 @@ experience conflicts, remove it.
|
|||
`kubectl` command is removed.
|
||||
|
||||
For more about using the Kubernetes integration with Docker Desktop Enterprise,
|
||||
see [Deploy on Kubernetes](https://docs.docker.com/docker-for-windows/kubernetes).
|
||||
see [Deploy on Kubernetes](../../../docker-for-windows/kubernetes.md).
|
||||
|
||||
#### Reset
|
||||
|
||||
|
@ -442,7 +439,7 @@ To switch to a different version pack, simply click on the version pack you woul
|
|||
|
||||
### Troubleshoot
|
||||
|
||||
The **Diagnose and Feedback** option allows you troubleshoot any issues you may be experiencing with Docker Desktop Enterprise. For more information, see [Troubleshoot DDE issues on Windows](/desktop/enterprise/troubleshoot/windows-issues).
|
||||
The **Diagnose and Feedback** option allows you troubleshoot any issues you may be experiencing with Docker Desktop Enterprise. For more information, see [Troubleshoot DDE issues on Windows](../troubleshoot/windows-issues.md).
|
||||
|
||||
### Switch between Windows and Linux containers
|
||||
|
||||
|
@ -454,13 +451,13 @@ For more information on Windows containers, refer to the following documentation
|
|||
|
||||
- Microsoft documentation on [Windows containers](https://docs.microsoft.com/en-us/virtualization/windowscontainers/about/index).
|
||||
|
||||
- [Build and Run Your First Windows Server Container](https://blog.docker.com/2016/09/build-your-first-docker-windows-server-container/) (blog post) gives a quick tour of how to build and run native Docker Windows containers on Windows 10 and Windows Server 2016 evaluation releases.
|
||||
- [Build and Run Your First Windows Server Container](https://www.docker.com/blog/build-your-first-docker-windows-server-container/) (blog post) gives a quick tour of how to build and run native Docker Windows containers on Windows 10 and Windows Server 2016 evaluation releases.
|
||||
|
||||
- [Getting Started with Windows Containers (Lab)](https://github.com/docker/labs/blob/master/windows/windows-containers/README.md)
|
||||
shows you how to use the [MusicStore](https://github.com/aspnet/MusicStore/)
|
||||
application with Windows containers. The MusicStore is a standard .NET application and, [forked here to use containers](https://github.com/friism/MusicStore), is a good example of a multi-container application.
|
||||
|
||||
- To understand how to connect to Windows containers from the local host, see [Limitations of Windows containers for `localhost` and published ports](https://docs.docker.com/docker-for-windows/troubleshoot/#limitations-of-windows-containers-for-localhost-and-published-ports).
|
||||
- To understand how to connect to Windows containers from the local host, see [Limitations of Windows containers for `localhost` and published ports](../../../docker-for-windows/troubleshoot.md#limitations-of-windows-containers-for-localhost-and-published-ports).
|
||||
|
||||
The **Settings** dialog changes with Windows containers. When you switch to Windows containers, the **Settings** dialog only shows those tabs that are active and apply to your Windows containers:
|
||||
|
||||
|
@ -480,11 +477,11 @@ If you set proxies or daemon configuration in Windows containers mode, these app
|
|||
|
||||
Select **Sign in /Create Docker ID** from the Docker Desktop Enterprise menu to access your [Docker Hub](https://hub.docker.com/) account. Once logged in, select **Repositories** on the Docker Desktop Enterprise menu to access your Docker Hub repositories directly.
|
||||
|
||||
See the following [Docker Hub topics](https://docs.docker.com/docker-hub/) to learn more:
|
||||
See the following [Docker Hub topics](../../../docker-hub/index.md) to learn more:
|
||||
|
||||
- [Organizations and Teams in Docker Hub](https://docs.docker.com/docker-hub/orgs/)
|
||||
- [Organizations and Teams in Docker Hub](../../../docker-hub/orgs.md)
|
||||
|
||||
- [Builds and Images](https://docs.docker.com/docker-hub/official_images/)
|
||||
- [Builds and Images](../../../docker-hub/official_images.md)
|
||||
|
||||
### Design new application
|
||||
|
||||
|
@ -494,5 +491,5 @@ Select this option to open the Application Designer user interface. Application
|
|||
|
||||
You can add trusted **Certificate Authorities (CAs)** to your Docker daemon to verify registry server certificates, and **client certificates**, to authenticate to registries.
|
||||
|
||||
For more information, see [How do I add custom CA certificates?](https://docs.docker.com/docker-for-windows/faqs/#how-do-i-add-custom-ca-certificates) and
|
||||
and [How do I add client certificates?](https://docs.docker.com/docker-for-windows/faqs/#how-do-i-add-client-certificates) in the FAQs.
|
||||
For more information, see [How do I add custom CA certificates?](../../../docker-for-windows/faqs.md#how-do-i-add-custom-ca-certificates) and
|
||||
and [How do I add client certificates?](../../../docker-for-windows/faqs.md#how-do-i-add-client-certificates) in the FAQs.
|
||||
|
|
Loading…
Reference in New Issue