mirror of https://github.com/docker/docs.git
first draft d4win, d4mac stable 1.13.0
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
Victoria Bialas
Misty Stanley-Jones
parent
19589d48cf
commit
3c3c05b790
Binary file not shown.
|
Before Width: | Height: | Size: 659 KiB After Width: | Height: | Size: 1.2 MiB |
Binary file not shown.
|
Before Width: | Height: | Size: 204 KiB After Width: | Height: | Size: 313 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 101 KiB After Width: | Height: | Size: 148 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 50 KiB After Width: | Height: | Size: 62 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 66 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 72 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 325 KiB After Width: | Height: | Size: 300 KiB |
|
|
@ -103,9 +103,7 @@ Windows containers.
|
|||
<p />
|
||||
* [Setup - Windows Server 2016 (Lab)](https://github.com/docker/labs/blob/master/windows/windows-containers/Setup-Server2016.md) specifically describes environment setup.
|
||||
<p />
|
||||
* [Switch
|
||||
between Windows and Linux containers (Beta
|
||||
feature)](index.md#switch-between-windows-and-linux-containers-beta-feature) describes the Linux / Windows containers toggle in Docker for Windows and points you to the tutorial mentioned above.
|
||||
* [Switch between Windows and Linux containers](#switch-between-windows-and-linux-containers) describes the Linux / Windows containers toggle in Docker for Windows and points you to the tutorial mentioned above.
|
||||
<p />
|
||||
* Docker Container Platform for Windows Server 2016 [articles and blog posts](https://www.docker.com/microsoft) on the Docker website
|
||||
|
||||
|
|
@ -367,6 +365,7 @@ display options through taskbar settings for notifications.
|
|||
|
||||
To get a popup menu with application options, right-click the whale:
|
||||
|
||||
|
||||
|
||||
|
||||
The **Settings** dialogs provide options to allow Docker auto-start,
|
||||
|
|
@ -374,13 +373,6 @@ automatically check for updates, share local drives with Docker containers,
|
|||
enable VPN compatibility, manage CPUs and memory Docker uses, restart Docker, or
|
||||
perform a factory reset.
|
||||
|
||||
**Beta 26 and newer** include an option to switch between Windows and Linux
|
||||
**conatiners. See [Switch between Windows and Linux containers (Beta
|
||||
**feature)](index.md#switch-between-windows-and-linux-containers-beta-feature).
|
||||
**This is not yet available on stable builds.
|
||||
|
||||
|
||||
|
||||
### General
|
||||
|
||||
|
||||
|
|
@ -415,7 +407,7 @@ one used here to set up sharing, your containers will not have permissions to
|
|||
access the mounted volumes.
|
||||
|
||||
>**Tip:** Shared drives are only required for volume mounting [Linux
|
||||
containers](#switch-between-windows-and-linux-containers-beta-feature), and not
|
||||
containers](#switch-between-windows-and-linux-containers), and not
|
||||
for Windows containers. For Linux containers, you need to share the drive where your project is located (i.e., where the Dockerfile and
|
||||
volume are located). Runtime errors such as file not found or cannot start
|
||||
service may indicate shared drives are needed. (See also [Volume mounting
|
||||
|
|
@ -495,30 +487,13 @@ When your proxy configuration changes, Docker restarts automatically to pick up
|
|||
If you have containers that you wish to keep running across restarts, you should consider using [restart policies](/engine/reference/run/#restart-policies-restart)
|
||||
|
||||
### Docker daemon
|
||||
You can configure options on the Docker daemon in the given JSON configuration file, and determine how your containers will run.
|
||||
|
||||
|
||||
You can configure options on the Docker daemon that determine how your
|
||||
containers will run. You can configure some **Basic** options on the daemon with interactive settings, or switch to **Advanced** to edit the JSON directly.
|
||||
|
||||
For a full list of options on the Docker daemon, see [daemon](/engine/reference/commandline/dockerd/){:target="_blank"} in the Docker Engine command line reference.
|
||||
|
||||
In that topic, see also:
|
||||
|
||||
* [Daemon configuration file](/engine/reference/commandline/dockerd/#/daemon-configuration-file)
|
||||
|
||||
* [Linux configuration file](/engine/reference/commandline/dockerd/#/linux-configuration-file)
|
||||
|
||||
* [Windows configuration file](/engine/reference/commandline/dockerd/#/windows-configuration-file)
|
||||
|
||||
Note that updating these settings requires a reconfiguration and reboot of the Linux VM.
|
||||
|
||||
#### Docker daemon basic and advanced (Beta features)
|
||||
|
||||
Starting with Beta 34, you can configure some **Basic** options on the daemon
|
||||
with interactive settings, or switch to **Advanced** to edit the JSON directly.
|
||||
|
||||
Note that the settings offered on **Basic** dialog can be configured directly in
|
||||
the JSON. This version just surfaces some of the commmon settings to make it
|
||||
easier to configure them.
|
||||
The settings offered on **Basic** dialog can be
|
||||
configured directly in the JSON as well. This version just surfaces
|
||||
some of the commmon settings to make it easier to configure them.
|
||||
|
||||
* [Experimental mode](#experimental-mode)
|
||||
* [Custom registries](#custom-registries)
|
||||
|
|
@ -531,10 +506,10 @@ easier to configure them.
|
|||
By default, Docker for Windows Beta releases use the experimental version of
|
||||
Docker Engine, described in the [Docker Experimental Features
|
||||
README](https://github.com/docker/docker/tree/master/experimental) on GitHub.
|
||||
Starting with Beta 34, you can toggle **experimental mode** on and off via the
|
||||
Starting with Beta 34 and Stable 1.13.0, you can toggle **experimental mode** on and off via the
|
||||
**Basic** Daemon settings. If you toggle it off, Docker for Windows Beta uses the
|
||||
current generally available release of Docker Engine, the same as Stable Docker
|
||||
for Windows versions uses.
|
||||
for Windows versions uses by default.
|
||||
|
||||
You can check whether you are running experimental mode or not by typing `docker
|
||||
version` in a PowerShell. Experimental mode is listed under `Server` data.
|
||||
|
|
@ -563,7 +538,7 @@ Server:
|
|||
|
||||
##### Custom registries
|
||||
|
||||
Also starting with with Beta 34, you can set up your own
|
||||
Also starting with with Beta 34 and Stable 1.13.0, you can set up your own
|
||||
[registries](/registry/introduction.md) on the **Basic** Daemon settings.
|
||||
|
||||
As an alternative to using [Docker Hub](https://hub.docker.com/) to store your
|
||||
|
|
@ -579,16 +554,26 @@ the FAQs.)
|
|||
The **Advanced** daemon settings provide the original option to directly edit
|
||||
the JSON configuration file for the <a
|
||||
href="/engine/reference/commandline/dockerd/"
|
||||
target="_blank">daemon</a>. (This is the only option currently available on stable releases, as described in [Docker daemon](#docker-daemon).)
|
||||
target="_blank">daemon</a>.
|
||||
|
||||
|
||||
|
||||
For a full list of options on the Docker daemon, see [daemon](/engine/reference/commandline/dockerd/) in the Docker Engine command line reference.
|
||||
|
||||
In that topic, see also:
|
||||
|
||||
* [Daemon configuration file](/engine/reference/commandline/dockerd/#/daemon-configuration-file)
|
||||
|
||||
* [Linux configuration file](/engine/reference/commandline/dockerd/#/linux-configuration-file)
|
||||
|
||||
* [Windows configuration file](/engine/reference/commandline/dockerd/#/windows-configuration-file)
|
||||
|
||||
Note that updating these settings requires a reconfiguration and reboot of the
|
||||
Linux VM.
|
||||
|
||||
### Switch between Windows and Linux containers (Beta feature)
|
||||
### Switch between Windows and Linux containers
|
||||
|
||||
Starting with Beta 26, you can select which daemon (Linux or Windows) the Docker
|
||||
Starting with Beta 26 and Stable 1.13.0, you can select which daemon (Linux or Windows) the Docker
|
||||
CLI talks to. Select **Switch to Windows containers** to toggle to Windows
|
||||
containers. Select **Switch to Linux containers**.
|
||||
|
||||
|
|
@ -596,7 +581,15 @@ Microsoft Developer Network has preliminary/draft information on Windows
|
|||
containers
|
||||
[here](https://msdn.microsoft.com/en-us/virtualization/windowscontainers/about/about_overview).
|
||||
|
||||
This feature is not yet available on stable builds.
|
||||
For a full list of options on the Docker daemon, see [daemon](/engine/reference/commandline/dockerd/){:target="_blank"} in the Docker Engine command line reference.
|
||||
|
||||
In that topic, see also:
|
||||
|
||||
* [Daemon configuration file](/engine/reference/commandline/dockerd/#/daemon-configuration-file)
|
||||
|
||||
* [Linux configuration file](/engine/reference/commandline/dockerd/#/linux-configuration-file)
|
||||
|
||||
* [Windows configuration file](/engine/reference/commandline/dockerd/#/windows-configuration-file)
|
||||
|
||||
#### Getting started with Windows containers
|
||||
|
||||
|
|
@ -626,10 +619,6 @@ containers:
|
|||
* [Diagnose and Feedback](#diagnose-and-feedback)
|
||||
* [Reset](#reset)
|
||||
|
||||
(Per the release notes, these dialogs are newly implemented for Windows
|
||||
containers mode in [Beta
|
||||
32](release-notes.md#beta-32-release-notes-2016-12-07-1130-rc3-beta32)).
|
||||
|
||||
Keep in mind that if you set proxies or daemon configuration in Windows
|
||||
containers mode, these apply only on Windows containers. If you switch back to
|
||||
Linux containers, proxies and daemon configurations return to what you had set
|
||||
|
|
@ -643,7 +632,6 @@ because they do not apply to Windows containers:
|
|||
* [Network](#network)
|
||||
* [Advanced (CPU and Memory configuration)](#advanced)
|
||||
|
||||
|
||||
### Giving feedback and getting help
|
||||
|
||||
To get help from the community, review current user topics, join or start a
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ Drives** and share the drive that contains the Dockerfile and volume.
|
|||
### Verify domain user has permissions for shared drives (volumes)
|
||||
|
||||
>**Tip:** Shared drives are only required for volume mounting [Linux
|
||||
containers](index.md#switch-between-windows-and-linux-containers-beta-feature),
|
||||
containers](index.md#switch-between-windows-and-linux-containers),
|
||||
not Windows containers.
|
||||
|
||||
Permissions to access shared drives are tied to the username and password you
|
||||
|
|
|
|||
Loading…
Reference in New Issue