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

Merge pull request #448 from thaJeztah/fix-typo 

Fix typo and minor Markdown edits
This commit is contained in:
Vincent Demeester 2017-08-17 19:59:55 +02:00 committed by GitHub
parent 799de1dae2 9544b70cb3
commit 070d0811e3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/commandline/build.md
View File

@ -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 acts as the build context. The system recursively fetches the
repository and its submodules. The commit history is not preserved. A repository and its submodules. The commit history is not preserved. A
repository is first pulled into a temporary directory on your local host. After 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 Local copy gives you the ability to access private repositories using local
user credentials, VPN's, and so forth. user credentials, VPN's, and so forth.

7
docs/reference/commandline/run.md
View File

@ -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. 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 - With `process` isolation, Windows will report the full memory of the host system, not the limit to applications running inside the container
```powershell ```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 CsTotalPhysicalMemory : 17064509440
CsPhyicallyInstalledMemory : 16777216 CsPhyicallyInstalledMemory : 16777216
@ -765,9 +766,11 @@ On Windows, this will affect containers differently depending on what type of is
OsInUseVirtualMemory : 1957488 OsInUseVirtualMemory : 1957488
OsMaxProcessMemorySize : 137438953344 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." - 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 ```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 CsTotalPhysicalMemory : 2683355136
CsPhyicallyInstalledMemory : CsPhyicallyInstalledMemory :