mirror of https://github.com/docker/docs.git
fix pending review comments
This commit is contained in:
usha-mandya
Maria Bermudez
parent
78692dd7a6
commit
dcec2f959e
|
|
@ -9,7 +9,6 @@ current release. The documentation is updated for each release.
|
|||
|
||||
For information on system requirements, installation, and download, see:
|
||||
|
||||
<<<<<<< HEAD
|
||||
- [Install Docker Desktop Enterprise on Mac](/ee/desktop/admin/install/mac)
|
||||
- [Install Docker Desktop Enterprise on Windows](/ee/desktop/admin/install/windows)
|
||||
|
||||
|
|
@ -77,34 +76,16 @@ For Docker Enterprise Engine release notes, see [Docker Engine release notes](/e
|
|||
- The Docker Template CLI plugin included in this version is an outdated version of the plugin and will fail when scaffolding templates. Note that the Application Designer is not affected by this outdated version of the CLI plugin.
|
||||
|
||||
### Docker Desktop Enterprise 2.0.0.1
|
||||
=======
|
||||
- [Install Docker Desktop Enterprise on Mac](/ee/desktop/install/mac)
|
||||
- [Install Docker Desktop Enterprise on Windows](/ee/desktop/install/windows)
|
||||
|
||||
For Docker Enterprise Engine release notes, see [Docker Engine release notes](/engine/release-notes).
|
||||
|
||||
# Docker Desktop Enterprise Releases of 2019
|
||||
|
||||
## Docker Desktop Enterprise 2.0.0.1
|
||||
>>>>>>> 1013: Move desktop ent content to docs-private
|
||||
|
||||
2019-03-01
|
||||
|
||||
**WARNING:** You must upgrade the previously installed Version Packs to the latest revision.
|
||||
|
||||
<<<<<<< HEAD
|
||||
#### Windows
|
||||
=======
|
||||
### Windows
|
||||
>>>>>>> 1013: Move desktop ent content to docs-private
|
||||
|
||||
Upgrades:
|
||||
|
||||
- Docker 18.09.3 for Version Pack Enterprise 2.1, fixes [CVE-2019-5736](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5736)
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> 1013: Move desktop ent content to docs-private
|
||||
- Docker 17.06.2-ee-20 for Version Pack Enterprise 2.0, fixes [CVE-2019-5736](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5736)
|
||||
|
||||
Bug fixes and minor changes:
|
||||
|
|
@ -113,11 +94,7 @@ Bug fixes and minor changes:
|
|||
- Fixed Hub login through the desktop UI not sync with login through `docker login` command line.
|
||||
- Fixed crash in system tray menu when the Hub login fails or Air gap mode.
|
||||
|
||||
<<<<<<< HEAD
|
||||
#### Mac
|
||||
=======
|
||||
### Mac
|
||||
>>>>>>> 1013: Move desktop ent content to docs-private
|
||||
|
||||
New features:
|
||||
|
||||
|
|
@ -127,10 +104,6 @@ New features:
|
|||
Upgrades:
|
||||
|
||||
- Docker 18.09.3 for Version Pack Enterprise 2.1, fixes [CVE-2019-5736](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5736)
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> 1013: Move desktop ent content to docs-private
|
||||
- Docker 17.06.2-ee-20 for Version Pack Enterprise 2.0, fixes [CVE-2019-5736](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5736)
|
||||
|
||||
Bug fixes and minor changes:
|
||||
|
|
@ -138,11 +111,7 @@ Bug fixes and minor changes:
|
|||
- Fixed port 8080 that was used on localhost when starting Kubernetes.
|
||||
- Improved error messaging to suggest running diagnostics / resetting to factory default only when it is appropriate.
|
||||
|
||||
<<<<<<< HEAD
|
||||
### Docker Desktop Enterprise 2.0.0.0
|
||||
=======
|
||||
## Docker Desktop Enterprise 2.0.0.0
|
||||
>>>>>>> 1013: Move desktop ent content to docs-private
|
||||
|
||||
2019-01-31
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
---
|
||||
title: Troubleshoot Docker Desktop Enterprise issues on Mac
|
||||
description: Troubleshoot Mac issues
|
||||
<<<<<<< HEAD
|
||||
keywords: Troubleshoot, diagnose, Mac, issues, Docker Enterprise, Docker Desktop, Enterprise
|
||||
---
|
||||
|
||||
|
|
@ -10,16 +9,6 @@ This page contains information on how to diagnose Docker Desktop Enterprise (DDE
|
|||
## Creating a diagnostics file in Docker Desktop Enterprise
|
||||
|
||||
Select **Diagnose and Feedback** from the Docker menu in the menu bar.
|
||||
=======
|
||||
keywords: Troubleshoot, diagnose, mac, issues, Docker Enterprise, Windows, Mac, Docker Desktop, Enterprise
|
||||
---
|
||||
|
||||
This topic contains information on how to diagnose Docker Desktop issues on Mac, send feedback, and submit the issues to Docker Support.
|
||||
|
||||
# Creating a diagnostics file in Docker Desktop Enterprise
|
||||
|
||||
Select **Diagnose and Feedback** from the whale menu in the menu bar.
|
||||
>>>>>>> 1013: Move desktop ent content to docs-private
|
||||
|
||||
|
||||
|
||||
|
|
@ -27,7 +16,6 @@ Once diagnostics are available, select the **Open** button to display the list o
|
|||
|
||||
Diagnostics are provided in .zip files identified by date and time. The uncompressed contents are also visible in the Finder window. Send your diagnostics file to your administrator for assistance.
|
||||
|
||||
<<<<<<< HEAD
|
||||
### Creating a diagnostics file from a terminal
|
||||
|
||||
In some cases, it is useful to run diagnostics yourself, for instance if Docker Desktop Enterprise cannot start.
|
||||
|
|
@ -40,25 +28,11 @@ To run diagnostics from a terminal, enter the following command:
|
|||
|
||||
This command displays the information that it is gathering, and when it finishes, it displays information resembling the following example:
|
||||
|
||||
=======
|
||||
## Creating a diagnostics file from a terminal
|
||||
|
||||
On occasion, it is useful to run diagnostics yourself, for instance if Docker Desktop Enterprise cannot start.
|
||||
|
||||
To run diagnostics from a terminal, enter the following command :
|
||||
```
|
||||
/Applications/Docker.app/Contents/MacOS/com.docker.diagnose gather
|
||||
```
|
||||
This command displays the information that it is gathering, and when it finishes, it displays information resembling the following example:
|
||||
>>>>>>> 1013: Move desktop ent content to docs-private
|
||||
```
|
||||
Diagnostics Bundle: /tmp/2A989798-1658-4BF0-934D-AC4F148D0782/20190115142942.zip
|
||||
Diagnostics ID: 2A989798-1658-4BF0-934D-AC4F148D0782/20190115142942
|
||||
```
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 1013: Move desktop ent content to docs-private
|
||||
The name of the diagnostics file is displayed next to “Diagnostics Bundle” (`/tmp/2A989798-1658-4BF0-934D-AC4F148D0782/20190115142942.zip` in this example). This is the file that you attach to the support ticket.
|
||||
|
||||
You can view the content of your diagnostics file using the **open** command and specifying the name of your diagnostics file:
|
||||
|
|
@ -67,11 +41,7 @@ You can view the content of your diagnostics file using the **open** command and
|
|||
$ open /tmp/2A989798-1658-4BF0-934D-AC4F148D0782/20190115142942.zip
|
||||
```
|
||||
|
||||
<<<<<<< HEAD
|
||||
### Viewing logs in a terminal
|
||||
=======
|
||||
## Viewing logs in a terminal
|
||||
>>>>>>> 1013: Move desktop ent content to docs-private
|
||||
|
||||
In addition to using the **Diagnose and Feedback** option to generate a diagnostics file, you can
|
||||
browse Docker Desktop Enterprise logs in a terminal or with the Console app.
|
||||
|
|
@ -91,16 +61,9 @@ Alternatively, to collect the last day of logs (`1d`) in a file, run:
|
|||
$ /usr/bin/log show --debug --info --style syslog --last 1d --predicate "$pred" >/tmp/logs.txt
|
||||
```
|
||||
|
||||
<<<<<<< HEAD
|
||||
### Viewing logs with the Console app
|
||||
|
||||
The Console log viewer is located in `/Applications/Utilities`; you can search for it with Spotlight Search.
|
||||
=======
|
||||
## Viewing logs with the Console app
|
||||
|
||||
The Console log viewer is located in `/Applications/Utilities`; you can search for it with
|
||||
Spotlight Search.
|
||||
>>>>>>> 1013: Move desktop ent content to docs-private
|
||||
|
||||
In the Console window search bar, type
|
||||
`docker` and press Enter. Then select **ANY** to expand the drop-down list next to your 'docker' search entry, and select **Process**.
|
||||
|
|
@ -110,10 +73,6 @@ In the Console window search bar, type
|
|||
You can use the Console app to search logs, filter the results in various
|
||||
ways, and create reports.
|
||||
|
||||
<<<<<<< HEAD
|
||||
### Additional Docker Desktop Enterprise troubleshooting topics
|
||||
=======
|
||||
## Additional Docker Desktop Enterprise troubleshooting topics
|
||||
>>>>>>> 1013: Move desktop ent content to docs-private
|
||||
|
||||
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.
|
||||
|
|
|
|||
|
|
@ -1,19 +1,12 @@
|
|||
---
|
||||
title: Troubleshoot Docker Desktop Enterprise issues on Windows
|
||||
description: Learn about Docker Desktop Enterprise
|
||||
<<<<<<< HEAD
|
||||
keywords: Docker EE, Windows, Docker Desktop, Enterprise, troubleshoot
|
||||
---
|
||||
|
||||
This page contains information on how to diagnose Docker Desktop Enterprise (DDE) issues on Windows.
|
||||
|
||||
## Creating a diagnostics file in Docker Desktop Enterprise
|
||||
=======
|
||||
keywords: Docker EE, Windows, Mac, Docker Desktop, Enterprise, troubleshoot
|
||||
---
|
||||
|
||||
# Creating a diagnostics file in Docker Desktop Enterprise
|
||||
>>>>>>> 1013: Move desktop ent content to docs-private
|
||||
|
||||
Right-click the Docker icon in the system tray and select **Diagnose and Feedback** from the menu. When the **Diagnose & Feedback** window opens, it starts collecting diagnostics.
|
||||
|
||||
|
|
@ -23,11 +16,7 @@ When the log capture is complete, select **You can find diagnostics here**. The
|
|||
|
||||
Send your diagnostics file to your administrator for assistance.
|
||||
|
||||
<<<<<<< HEAD
|
||||
### Creating a diagnostics file from a terminal
|
||||
=======
|
||||
## Creating a diagnostics file from a terminal
|
||||
>>>>>>> 1013: Move desktop ent content to docs-private
|
||||
|
||||
In some cases, it is useful to run diagnostics yourself, for instance if
|
||||
Docker Desktop Enterprise cannot start.
|
||||
|
|
@ -45,14 +34,8 @@ Diagnostics Bundle: C:\Users\djs\AppData\Local\Temp\6CE654F6-7B17-4FC7-AAE0-CC53
|
|||
Diagnostics ID: 6CE654F6-7B17-4FC7-AAE0-CC53B73B76A2/20190115163621
|
||||
```
|
||||
|
||||
<<<<<<< HEAD
|
||||
The name of the diagnostics file is displayed next to “Diagnostics Bundle” (`\Temp\6CE654F6-7B17-4FC7-AAE0-CC53B73B76A2\20190115163621.zip` in this example). This is the file that you attach to the support ticket.
|
||||
|
||||
### Additional Docker Desktop Enterprise troubleshooting topics
|
||||
=======
|
||||
The name of the diagnostics file is displayed next to “Diagnostics Bundle” (C:\Users\djs\AppData\Local\Temp\6CE654F6-7B17-4FC7-AAE0-CC53B73B76A2\20190115163621.zip in this example). This is the file that you attach to the support ticket.
|
||||
|
||||
## Additional Docker Desktop Enterprise troubleshooting topics
|
||||
>>>>>>> 1013: Move desktop ent content to docs-private
|
||||
|
||||
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.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
---
|
||||
title: Use Docker Desktop Enterprise on Mac
|
||||
description: Exploring the Mac user interface
|
||||
keywords: Docker EE, Windows, Mac, Docker Desktop, Enterprise
|
||||
---
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue