diff --git a/desktop/enterprise/admin/configure/mac-admin.md b/desktop/enterprise/admin/configure/mac-admin.md index 50d3167774..da42a02c92 100644 --- a/desktop/enterprise/admin/configure/mac-admin.md +++ b/desktop/enterprise/admin/configure/mac-admin.md @@ -148,3 +148,48 @@ Parameter values and descriptions for environment configuration on Mac: |`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.| + +### File format update + +#### From version 1 to 2 + +Docker Desktop Enterprise 2.3.0.0-ent contains a change in the configuration file format. + +If you haven’t made any changes to the `admin-settings.json` file in the previous installation, you can simply delete it and Docker Desktop will re-create it automatically. +Otherwise manual steps are required to update the `admin-settings.json` file. + +1. Increase the value of the `configurationFileVersion` field from `1` to `2`, i.e. before: + ```json + { + "configurationFileVersion": 1, + ... + } + ``` + after: + ```json + { + "configurationFileVersion": 2, + ... + } + ``` + +2. Move the `filesharingDirectories` field outside the `linuxVM` field, e.g. before: + ```json + "linuxVM": { + ... + "filesharingDirectories": { + "locked": true, + "value": ["/Users"] + } + } + ``` + after: + ```json + "linuxVM": { + ... + }, + "filesharingDirectories": { + "locked": true, + "value": ["/Users"] + } + ``` diff --git a/desktop/enterprise/admin/configure/windows-admin.md b/desktop/enterprise/admin/configure/windows-admin.md index 83fa4d0bde..94c48fd279 100644 --- a/desktop/enterprise/admin/configure/windows-admin.md +++ b/desktop/enterprise/admin/configure/windows-admin.md @@ -199,3 +199,49 @@ Parameter values and descriptions for environment configuration on Windows: |`repositories`|Lists the repositories that are allowed.| | `sharedDrives` | If `sharedDrives` is set to `true`, this locks the drives users are allowed to share ( `["C", "D"]` ), but does not actually share drives by default (sharing a drive prompts the user for a password). `value` is a whitelist of drives that can be shared. **Warning:** Note that when updating this value, if you remove drives that have been shared, you must also `net share /delete` those drives. | | `sharedFolders` | If specified, restricts the folders or named pipes the user is allowed to share with Windows containers. | + +### File format update + +#### From version 1 to 2 + +Docker Desktop Enterprise 2.3.0.0-ent contains a change in the configuration file format. + +If you haven’t made any changes to the `admin-settings.json` file in the previous installation, you can simply delete it and Docker Desktop will re-create it automatically. +Otherwise manual steps are required to update the `admin-settings.json` file. + +1. Increase the value of the `configurationFileVersion` field from 1 to 2, i.e. before: + ```json + { + "configurationFileVersion": 1, + ... + } + ``` + after: + ```json + { + "configurationFileVersion": 2, + ... + } + ``` + +2. Replace the `sharedDrives` and `sharedFolders` fields with a single `filesharingDirectories` field, e.g. before: + ```json + { + ... + "sharedDrives": { + "locked": true, + "value": ["C"] + }, + "sharedFolders": ["%USERPROFILE%"] + } + ``` + after: + ```json + { + ... + "filesharingDirectories": { + "locked": true, + "value": ["C:", "%USERPROFILE%"] + } + } + ``` diff --git a/desktop/enterprise/release-notes.md b/desktop/enterprise/release-notes.md index f626f2be5f..734b317c2b 100644 --- a/desktop/enterprise/release-notes.md +++ b/desktop/enterprise/release-notes.md @@ -17,12 +17,35 @@ For information on system requirements, installation, and download, see: For Docker Enterprise Engine release notes, see [Docker Engine release notes](/engine/release-notes). +## Version 2.3.0.0 +2020-04-22 + +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) + +### Bug fixes and minor changes + +- Windows: in the `admin-settings.json` configuration file, the `sharedDrives` and `sharedFolders` fields have been replaced by a unique `filesharingDirectories` field. +- Mac: in the `admin-settings.json` configuration file, the `filesharingDirectories` has been moved out of the `linuxVM` section. +- The `admin-settings.json` configuration file `configurationFileVersion` field value has been increased from 1 to 2. + +### Known issue + +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) + ## Version 2.1.0.9 2020-03-13 ### Bug fixes and minor changes -Windows: Security fix - Diagnostics were collected with Administrator privileges, which led to a possible privilege escalation on systems where the Docker Desktop user was not an administrator. +- Windows: Security fix - Diagnostics were collected with Administrator privileges, which led to a possible privilege escalation on systems where the Docker Desktop user was not an administrator. ## Version 2.1.0.8 2019-11-14 @@ -58,14 +81,14 @@ Docker Desktop Enterprise 2.1.0.6 contains a Kubernetes upgrade. Note that your ### Bug fixes and minor changes -Windows: Docker Desktop no longer tries to modify the `/etc/hosts` file inside Windows containers to add `*.docker.internal` DNS entries. +- Windows: Docker Desktop no longer tries to modify the `/etc/hosts` file inside Windows containers to add `*.docker.internal` DNS entries. ## Version 2.1.0.5 2019-09-16 ### Bug fixes and minor changes - Mac: All binaries included in Docker Desktop are now notarized so that they can run on macOS Catalina. For more information, see [Notarization Requirement for Mac Software](https://developer.apple.com/news/?id=06032019i). + - Mac: All binaries included in Docker Desktop are now notarized so that they can run on macOS Catalina. For more information, see [Notarization Requirement for Mac Software](https://developer.apple.com/news/?id=06032019i). ## Version 2.1.0.4 2019-09-03 @@ -92,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](https://docs.docker.com/engine/release-notes/) in Version Pack Enterprise 3.0. ## Version 2.1.0.1 2019-07-22