docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1182 from usha-mandya/app-template-1108 

1108: Adding App designer/template admin settings
This commit is contained in:
Usha Mandya 2019-06-11 15:44:00 +01:00 committed by GitHub
parent 1c1c8bdb39 52d22e3735
commit 7a5d156cd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ee/desktop/admin/configure/mac-admin.md
View File

@ -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", "..."]
@ -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 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.|

17
ee/desktop/admin/configure/windows-admin.md
View File

@ -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 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. |
| `sharedFolders` | If specified, restricts the folders or named pipes the user is allowed to share with Windows containers. |