You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: desktop/enterprise/admin/configure/mac-admin.md
+2-2
Original file line number
Diff line number
Diff line change
@@ -141,15 +141,15 @@ Parameter values and descriptions for environment configuration on Mac:
141
141
|`swapMiB`| Specifies the amount of memory in MiB (1 MiB = 1048576 bytes) allocated for the swap file. |
142
142
|`dataFolder`| Specifies the directory containing the VM disk files. |
143
143
|`diskSizeMiB`| Specifies the amount of disk storage in MiB (1 MiB = 1048576 bytes) allocated for images and containers. |
144
-
|`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). |
144
+
|`dockerDaemonOptions`| Overrides the options in the linux daemon config file. For more information, see [Docker engine reference](/engine/reference/commandline/dockerd/#daemon-configuration-file). |
145
145
| (End of `linuxVM` section.) ||
146
146
|`kubernetes`| Parameters and settings related to kubernetes options - grouped together here for convenience. |
147
147
|`enabled`| If `locked` is set to `true`, the Kubernetes cluster starts when Docker Desktop Enterprise is started. |
148
148
|`showSystemContainers`| If true, displays Kubernetes internal containers when running docker commands such as `docker ps`. |
149
149
|`podNetworkCIDR`| This is currently unimplemented. `locked` must be set to true. |
150
150
|`serviceCIDR`| This is currently unimplemented. `locked` must be set to true. |
151
151
| (End of `kubernetes` section.) ||
152
-
|`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/).|
152
+
|`template`|Parameters and settings related to Docker Template and Application Designer - grouped together in this example for convenience. |
153
153
|`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. |
154
154
|`defaultRegistry`|Specifies the default registry to be used in Docker Template and Application Designer.|
155
155
|`repositories`|Lists the repositories that are allowed.|
Copy file name to clipboardExpand all lines: desktop/enterprise/admin/configure/windows-admin.md
+3-3
Original file line number
Diff line number
Diff line change
@@ -185,18 +185,18 @@ Parameter values and descriptions for environment configuration on Windows:
185
185
|`vpnkitCIDR`| Specifies the subnet used for VPNKit networking and drive sharing. The chosen subnet must not conflict with other resources on your network. |
186
186
|`useDnsForwarder`| If `value` is set to `true`, this automatically determines the upstream DNS servers based on the host's network adapters. |
187
187
|`dns`| If `value` for `useDnsForwarder` is set to `false`, the Linux VM uses the server information in this `value` setting for DNS resolution. |
188
-
|`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). |
188
+
|`dockerDaemonOptions`| Overrides the options in the Linux daemon config file. For more information, see [Docker engine reference](/engine/reference/commandline/dockerd/#daemon-configuration-file). |
189
189
| (End of `linuxVM` section.) ||
190
190
|`windows`| Parameters and settings related to the Windows daemon-related options - grouped together in this example for convenience. |
191
-
|`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). |
191
+
|`dockerDaemonOptions`| Overrides the options in the Windows daemon config file. For more information, see [Docker engine reference](/engine/reference/commandline/dockerd/#daemon-configuration-file). |
192
192
| (End of `windows` section.) ||
193
193
|`kubernetes`| Parameters and settings related to kubernetes options - grouped together here for convenience. |
194
194
|`enabled`| If `locked` is set to `true`, the Kubernetes cluster starts when Docker Desktop Enterprise is started. |
195
195
|`showSystemContainers`| If true, displays Kubernetes internal containers when running docker commands such as `docker ps`. |
196
196
|`podNetworkCIDR`| This is currently unimplemented. `locked` must be set to true. |
197
197
|`serviceCIDR`| This is currently unimplemented. `locked` must be set to true. |
198
198
| (End of `kubernetes` section.) ||
199
-
|`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/).|
199
+
|`template`|Parameters and settings related to Docker Template and Application Designer - grouped together in this example for convenience. |
200
200
|`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. |
201
201
|`defaultRegistry`|Specifies the default registry to be used in Docker Template and Application Designer.|
202
202
|`repositories`|Lists the repositories that are allowed.|
Copy file name to clipboardExpand all lines: desktop/enterprise/admin/install/mac.md
+1-1
Original file line number
Diff line number
Diff line change
@@ -34,7 +34,7 @@ Double-click the `.pkg` file to begin the installation and follow the on-screen
34
34
35
35
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.
36
36
37
-
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).
37
+
Administrators can configure additional settings by modifying the administrator configuration file. For more information, see [Configure Desktop Enterprise for Mac](../configure/mac-admin.md).
Copy file name to clipboardExpand all lines: desktop/enterprise/app-designer.md
+6-6
Original file line number
Diff line number
Diff line change
@@ -12,11 +12,11 @@ The Application Designer helps Docker developers quickly create new
12
12
Docker apps using a library of templates. To start the Application
13
13
Designer, select the **Design new application** menu entry.
14
14
15
-
![The Application Designer lets you choose an existing template or create a custom application.](./images/app-design-start.png"Application Designer")
15
+
![The Application Designer lets you choose an existing template or create a custom application.](/desktop/enterprise/images/app-design-start.png"Application Designer")
16
16
17
17
The list of available templates is provided:
18
18
19
-
![You can tab through the available application templates. A description of each template is provided.](./images/app-design-choose.png"Available templates for application creation")
19
+
![You can tab through the available application templates. A description of each template is provided.](/desktop/enterprise/images/app-design-choose.png"Available templates for application creation")
20
20
21
21
After selecting a template, you can then customize your application, For
22
22
example, if you select **Flask / NGINX / MySQL**, you can then
@@ -25,19 +25,19 @@ example, if you select **Flask / NGINX / MySQL**, you can then
25
25
26
26
- choose different external ports:
27
27
28
-
![You can customize your application, which includes specifying database, proxy, and other details.](./images/app-design-custom.png"Customizing your application")
28
+
![You can customize your application, which includes specifying database, proxy, and other details.](/desktop/enterprise/images/app-design-custom.png"Customizing your application")
29
29
30
30
You can then name your application and customize the disk location:
31
31
32
-
![You can also customize the name and location of your application.](./images/app-design-custom2.png"Naming and specifying a location for your application")
32
+
![You can also customize the name and location of your application.](/desktop/enterprise/images/app-design-custom2.png"Naming and specifying a location for your application")
33
33
34
34
When you select **Assemble**, your application is created.
35
35
36
-
![When you assemble your application, a status screen is displayed.](./images/app-design-test.png"Assembling your application")
36
+
![When you assemble your application, a status screen is displayed.](/desktop/enterprise/images/app-design-test.png"Assembling your application")
37
37
38
38
Once assembled, the following screen allows you to run the application. Select **Run application** to pull the images and start the containers:
39
39
40
-
![When you run your application, the terminal displays output from the application.](./images/app-design-run.png"Running your application")
40
+
![When you run your application, the terminal displays output from the application.](/desktop/enterprise/images/app-design-run.png"Running your application")
41
41
42
42
Use the corresponding buttons to start and stop your application. Select **Open in Finder** on Mac or **Open in Explorer** on Windows to
43
43
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
Copy file name to clipboardExpand all lines: desktop/enterprise/index.md
+2-2
Original file line number
Diff line number
Diff line change
@@ -8,9 +8,9 @@ redirect_from:
8
8
9
9
Welcome to Docker Desktop Enterprise. This page contains information about the Docker Desktop Enterprise (DDE) release. For information about Docker Desktop Community, see:
10
10
11
-
-[Docker Desktop for Mac (Community)](/docker-for-mac/){: target="_blank" rel="noopener" class="_"}
11
+
-[Docker Desktop for Mac (Community)](../../docker-for-mac/index.md)
12
12
13
-
-[Docker Desktop for Windows (Community)](/docker-for-windows/){: target="_blank" rel="noopener" class="_"}
13
+
-[Docker Desktop for Windows (Community)](../../docker-for-windows/index.md)
14
14
15
15
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.
Copy file name to clipboardExpand all lines: desktop/enterprise/release-notes.md
+26-26
Original file line number
Diff line number
Diff line change
@@ -12,19 +12,19 @@ This page contains information about the new features, improvements, known issue
12
12
13
13
For information on system requirements, installation, and download, see:
14
14
15
-
-[Install Docker Desktop Enterprise on Mac](/desktop/enterprise/admin/install/mac)
16
-
-[Install Docker Desktop Enterprise on Windows](/desktop/enterprise/admin/install/windows)
15
+
-[Install Docker Desktop Enterprise on Mac](admin/install/mac.md)
16
+
-[Install Docker Desktop Enterprise on Windows](admin/install/windows.md)
17
17
18
-
For Docker Enterprise Engine release notes, see [Docker Engine release notes](/engine/release-notes).
18
+
For Docker Engine release notes, see [Docker Engine release notes](../../engine/release-notes/index.md).
19
19
20
20
## Version 2.3.0.0
21
21
2020-04-22
22
22
23
23
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.
24
24
25
25
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:
26
-
-[Docker Desktop Community release notes on Mac](/docker-for-mac/release-notes)
27
-
-[Docker Desktop Community release notes on Windows](/docker-for-windows/release-notes)
26
+
-[Docker Desktop Community release notes on Mac](../../docker-for-mac/release-notes.md)
27
+
-[Docker Desktop Community release notes on Windows](../../docker-for-windows/release-notes.md)
28
28
29
29
### Bug fixes and minor changes
30
30
@@ -37,8 +37,8 @@ This version includes all the bug fixes and minor changes between Docker Desktop
37
37
Docker Desktop Enterprise 2.3.0.0 contains a change in the configuration file format.
38
38
39
39
For more information, see:
40
-
-[Update Docker Desktop Enterprise configuration file from version 1 to 2 on Mac](/desktop/enterprise/admin/configure/mac-admin/#from-version-1-to-2)
41
-
-[Update Docker Desktop Enterprise configuration file from version 1 to 2 on Windows](/desktop/enterprise/admin/configure/windows-admin/#from-version-1-to-2)
40
+
-[Update Docker Desktop Enterprise configuration file from version 1 to 2 on Mac](admin/configure/mac-admin.md#from-version-1-to-2)
41
+
-[Update Docker Desktop Enterprise configuration file from version 1 to 2 on Windows](admin/configure/windows-admin.md#from-version-1-to-2)
42
42
43
43
## Version 2.1.0.9
44
44
2020-03-13
@@ -54,18 +54,18 @@ Docker Desktop Enterprise 2.1.0.8 contains a Kubernetes upgrade. Note that your
54
54
55
55
### Upgrades
56
56
57
-
-[Docker 19.03.5](https://docs.docker.com/engine/release-notes/#19035/) in Version Pack Enterprise 3.0
57
+
-[Docker 19.03.5](/engine/release-notes/#19035) in Version Pack Enterprise 3.0
58
58
-[Kubernetes 1.14.8](https://github.com/kubernetes/kubernetes/releases/tag/v1.14.8) in Version Pack Enterprise 3.0
59
-
-[Docker 18.09.11](https://docs.docker.com/engine/release-notes/#180911) in Version Pack Enterprise 2.1
60
-
-[Docker 17.06.2-ee-25](https://docs.docker.com/engine/release-notes/#17062-ee-25) in Version Pack Enterprise 2.0
59
+
-[Docker 18.09.11](/engine/release-notes/#180911) in Version Pack Enterprise 2.1
60
+
-[Docker 17.06.2-ee-25](/engine/release-notes/#17062-ee-25) in Version Pack Enterprise 2.0
@@ -146,7 +146,7 @@ Workaround: After signing back into Windows, when Docker Desktop has started, ri
146
146
147
147
### Upgrades
148
148
149
-
-[Docker 19.03.0-rc2](https://docs.docker.com/engine/release-notes/) in Version Pack Enterprise 3.0
149
+
-[Docker 19.03.0-rc2](/engine/release-notes/) in Version Pack Enterprise 3.0
150
150
- Application Designer 0.1.3
151
151
152
152
### Bug fixes and minor changes
@@ -162,7 +162,7 @@ Workaround: After signing back into Windows, when Docker Desktop has started, ri
162
162
163
163
### Upgrades
164
164
165
-
-[Docker 19.03.0-rc1](https://docs.docker.com/engine/release-notes/) in Enterprise 3.0 version pack
165
+
-[Docker 19.03.0-rc1](/engine/release-notes/) in Enterprise 3.0 version pack
166
166
- Application Designer 0.1.2
167
167
-[Qemu 4.0.0](https://github.com/docker/binfmt) to cross-compile ARM devices
168
168
@@ -180,8 +180,8 @@ Workaround: After signing back into Windows, when Docker Desktop has started, ri
180
180
181
181
### Upgrades
182
182
183
-
-[Docker 19.03.0-beta4](https://docs.docker.com/engine/release-notes/) in Enterprise 3.0 version pack
184
-
-[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
183
+
-[Docker 19.03.0-beta4](/engine/release-notes/) in Enterprise 3.0 version pack
184
+
-[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
@@ -201,7 +201,7 @@ Workaround: After signing back into Windows, when Docker Desktop has started, ri
201
201
202
202
### Upgrades
203
203
204
-
-[Docker Engine 19.03.0-beta2](https://docs.docker.com/engine/release-notes/) for Version Pack Enterprise 3.0.
204
+
-[Docker Engine 19.03.0-beta2](/engine/release-notes/) for Version Pack Enterprise 3.0.
205
205
206
206
## Version 2.0.0.2
207
207
2019-04-19
@@ -210,15 +210,15 @@ Workaround: After signing back into Windows, when Docker Desktop has started, ri
210
210
211
211
### New
212
212
213
-
- 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)
213
+
- 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)
214
214
215
215
- Application Designer now includes new templates for AngularJS and VueJS.
-[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
221
-
-[Docker Engine 17.06.2-ee-21](https://docs.docker.com/engine/release-notes/) for Version Pack Enterprise 2.0
220
+
-[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
221
+
-[Docker Engine 17.06.2-ee-21](/engine/release-notes/) for Version Pack Enterprise 2.0
0 commit comments