From 9544b70cb304b5219c444eb29e86750805f751dd Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 16 Aug 2017 17:53:57 +0200 Subject: [PATCH] Fix typo and minor Markdown edits Signed-off-by: Sebastiaan van Stijn --- docs/reference/commandline/build.md | 2 +- docs/reference/commandline/run.md | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/reference/commandline/build.md b/docs/reference/commandline/build.md index 1e535edd2b..5f6623756d 100644 --- a/docs/reference/commandline/build.md +++ b/docs/reference/commandline/build.md @@ -78,7 +78,7 @@ When the `URL` parameter points to the location of a Git repository, the repository acts as the build context. The system recursively fetches the repository and its submodules. The commit history is not preserved. A repository is first pulled into a temporary directory on your local host. After -the that succeeds, the directory is sent to the Docker daemon as the context. +that succeeds, the directory is sent to the Docker daemon as the context. Local copy gives you the ability to access private repositories using local user credentials, VPN's, and so forth. diff --git a/docs/reference/commandline/run.md b/docs/reference/commandline/run.md index 985707a31a..77bac7d2ae 100644 --- a/docs/reference/commandline/run.md +++ b/docs/reference/commandline/run.md @@ -753,8 +753,9 @@ is set on the cgroup and applications in a container can query it at `/sys/fs/cg On Windows, this will affect containers differently depending on what type of isolation is used. - With `process` isolation, Windows will report the full memory of the host system, not the limit to applications running inside the container + ```powershell - docker run -it -m 2GB --isolation=process microsoft/nanoserver powershell Get-ComputerInfo *memory* + PS C:\> docker run -it -m 2GB --isolation=process microsoft/nanoserver powershell Get-ComputerInfo *memory* CsTotalPhysicalMemory : 17064509440 CsPhyicallyInstalledMemory : 16777216 @@ -765,9 +766,11 @@ On Windows, this will affect containers differently depending on what type of is OsInUseVirtualMemory : 1957488 OsMaxProcessMemorySize : 137438953344 ``` + - With `hyperv` isolation, Windows will create a utility VM that is big enough to hold the memory limit, plus the minimal OS needed to host the container. That size is reported as "Total Physical Memory." + ```powershell - docker run -it -m 2GB --isolation=hyperv microsoft/nanoserver powershell Get-ComputerInfo *memory* + PS C:\> docker run -it -m 2GB --isolation=hyperv microsoft/nanoserver powershell Get-ComputerInfo *memory* CsTotalPhysicalMemory : 2683355136 CsPhyicallyInstalledMemory :