From 69e5e78b029c7c3aaee71a816181ff733a9ba4bd Mon Sep 17 00:00:00 2001 From: usha-mandya Date: Tue, 11 Jun 2019 14:29:34 +0100 Subject: [PATCH 1/3] 1108: Adding App designer/template admin settings --- ee/desktop/admin/configure/mac-admin.md | 19 ++++++++++++++++++- ee/desktop/admin/configure/windows-admin.md | 17 +++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/ee/desktop/admin/configure/mac-admin.md b/ee/desktop/admin/configure/mac-admin.md index bddbfabcbf..d2c40ac2ed 100644 --- a/ee/desktop/admin/configure/mac-admin.md +++ b/ee/desktop/admin/configure/mac-admin.md @@ -102,7 +102,20 @@ The following `admin-settings.json` code and table provide the required syntax a "locked": false, "value": null } - } + }, + + "template" : { + "defaultOrg" : {"value": "myorg", "locked":true}, + "defaultRegistry" : {"value": "mydtr:5000", "locked":true}, + "repositories": { + "value": [ + "https://one/library.yaml", + "https://two/library.yaml", + "https://three/library.yaml" + ], + "locked" : true + } + }, } ``` @@ -129,3 +142,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/).| +|`defaultOrg`| Specifies the default organisation 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.| diff --git a/ee/desktop/admin/configure/windows-admin.md b/ee/desktop/admin/configure/windows-admin.md index d14d10b7c2..8393197a21 100644 --- a/ee/desktop/admin/configure/windows-admin.md +++ b/ee/desktop/admin/configure/windows-admin.md @@ -139,6 +139,19 @@ The following `admin-settings.json` code and table provide the required syntax a } }, + "template" : { + "defaultOrg" : {"value": "myorg", "locked":true}, + "defaultRegistry" : {"value": "mydtr:5000", "locked":true}, + "repositories": { + "value": [ + "https://one/library.yaml", + "https://two/library.yaml", + "https://three/library.yaml" + ], + "locked" : true + } + }, + "sharedDrives": { "locked": true, "value": [ ] @@ -178,5 +191,9 @@ 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/).| +|`defaultOrg`| Specifies the default organisation 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.| | `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. | From 0e6c7e3d0ecb5bcff39eb26e124ef05dbffdf509 Mon Sep 17 00:00:00 2001 From: usha-mandya Date: Tue, 11 Jun 2019 15:12:02 +0100 Subject: [PATCH 2/3] update the order of the parameters --- ee/desktop/admin/configure/mac-admin.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ee/desktop/admin/configure/mac-admin.md b/ee/desktop/admin/configure/mac-admin.md index d2c40ac2ed..d5f71807ba 100644 --- a/ee/desktop/admin/configure/mac-admin.md +++ b/ee/desktop/admin/configure/mac-admin.md @@ -65,14 +65,14 @@ The following `admin-settings.json` code and table provide the required syntax a "locked": false, "value": 1024 }, + "dataFolder" : { + "locked" : false, + "value" : "/Users/..." + }, "diskSizeMiB": { "locked": false, "value": 65536 }, - "dataFolder" : { - "value" : "/Users/...", - "locked" : false - }, "filesharingDirectories": { "locked":false, "value":["/Users", "..."] From 52d22e373522b885bdc2d8fb647fb1db808a5e99 Mon Sep 17 00:00:00 2001 From: usha-mandya Date: Tue, 11 Jun 2019 15:31:39 +0100 Subject: [PATCH 3/3] minor update to admin-jason file --- ee/desktop/admin/configure/mac-admin.md | 2 +- ee/desktop/admin/configure/windows-admin.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/desktop/admin/configure/mac-admin.md b/ee/desktop/admin/configure/mac-admin.md index d5f71807ba..8cc0feb8e3 100644 --- a/ee/desktop/admin/configure/mac-admin.md +++ b/ee/desktop/admin/configure/mac-admin.md @@ -143,6 +143,6 @@ Parameter values and descriptions for environment configuration on Mac: | `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/).| -|`defaultOrg`| Specifies the default organisation 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. | +|`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.| diff --git a/ee/desktop/admin/configure/windows-admin.md b/ee/desktop/admin/configure/windows-admin.md index 8393197a21..4195655d5f 100644 --- a/ee/desktop/admin/configure/windows-admin.md +++ b/ee/desktop/admin/configure/windows-admin.md @@ -192,7 +192,7 @@ Parameter values and descriptions for environment configuration on Windows: | `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/).| -|`defaultOrg`| Specifies the default organisation 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. | +|`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.| | `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. |