summaryrefslogtreecommitdiff
path: root/docs/reference/commandline
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23331 from yongtang/06062016-docs-typoBrian Goff2016-06-161-1/+1
| | | | | | | Fix a couple of typos in the docs of `docker attach` (cherry picked from commit 3d8fdbb6264c83975bfd36b68e3b67d12a3006c1) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Add alias to make CI passSebastiaan van Stijn2016-06-091-0/+1
| | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #23293 from mountkin/network-docsSebastiaan van Stijn2016-06-061-1/+1
| | | | | | docs: correct network create command (cherry picked from commit ac14aa11b6f9172c744affa9823d05fde721c5e0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #23282 from yongtang/06052016-docs-typoSebastiaan van Stijn2016-06-061-1/+1
| | | | | | | Fix a couple of typos in docker attach docs. (cherry picked from commit cfcb470aad367dea7b9f6df96ff12f577a22a2b0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #23251 from SvenDowideit/more-validation-fixesSebastiaan van Stijn2016-06-061-1/+1
| | | | | | | docs validation fixes (cherry picked from commit da703f026e0793e4caf349487f63a7c1ab09d1c3) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #23193 from allencloud/fix-typosSven Dowideit2016-06-063-4/+4
| | | | | | | use grep to find all a/an typos (cherry picked from commit 98c245c9e63793cf8ca03c5500e0820447c1861c) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #23060 from friism/add-power-shell-exampleSebastiaan van Stijn2016-06-061-1/+5
| | | | | | | Add power shell example (cherry picked from commit 068d466cc7cd4ef3915b983b61e9cd029936ac90) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #22763 from zreigz/doc-multiple-daemonsSven Dowideit2016-06-061-0/+56
| | | | | | | Add documentation for running multiple daemons (cherry picked from commit 9be8f04950f918b91e3d4166597e9e2eee74fbd6) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #23039 from yongtang/05262016-docs-cluster-store-optsVincent Demeester2016-05-271-1/+1
| | | | | | | Fix error in dockerd.md for incorrect cluster-store-opts example. (cherry picked from commit f1276cd3aa8d2bff6e3ab1ac3a175deeecac405e) Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
* Merge pull request #23035 from SvenDowideit/fix-linksSebastiaan van Stijn2016-05-272-2/+2
| | | | | | | Fix up stale links (cherry picked from commit bd5c9f59ea9dde983bf40b36f16311e550a5c2e4) Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
* Merge pull request #22906 from nshalman/patch-1Vincent Demeester2016-05-251-0/+3
| | | | | | | Clarification about 'docker build --build-arg' (cherry picked from commit ce07eac570e90ed8aa69472bae463902c075e078) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #22900 from AkihiroSuda/fix22020Vincent Demeester2016-05-251-1/+11
| | | | | | | update docs/reference/commandline/cp.md (cherry picked from commit 6a385a00226dc7d8a35406ae284bb6731444d524) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #22778 from ↵Vincent Demeester2016-05-251-0/+9
| | | | | | | | DoraALin/10972-docs-Support-for-non-proxied-private-registry doc:http pkg variables info added in pull cmd (cherry picked from commit 9751170f08a143e86709879c70b4a924c3161683) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #22768 from mansinahar/run-cmd-docVincent Demeester2016-05-251-6/+6
| | | | | | | Update 'run' command doc for better readability. Issue:#22721 (cherry picked from commit 28a436af3641f202287f98e326537a10897da9fa) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #22751 from igrcic/docs-small-typo-reference-attachSebastiaan van Stijn2016-05-251-1/+1
| | | | | | | remove double "using" in reference attach docs (cherry picked from commit 6e12d0720fc6acdf55ee98013b33b6846645f153) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* docs: clarify docker attachTonis Tiigi2016-05-111-0/+9
| | | | | | Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit da1dbd2093ec040f05f4daf9fc8ca28dc8262ec8) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* The daemon.json storage-opts settings is actually a list.Dimitry Andric2016-04-281-1/+1
| | | | | | Signed-off-by: Dimitry Andric <d.andric@activevideo.com> (cherry picked from commit e3eb24fc21fa6f6002eef081278333f9e5e16614) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Fixes #21701 devicemapper docsMary Anthony2016-04-131-19/+23
| | | | | | | | | | | | Copy edit the content Updates to existing material Adding mbentley's comments Updating with last minute comments Update with Seb's comments Signed-off-by: Mary Anthony <mary@docker.com> (cherry picked from commit 783ebebff40ebdae27dc72b4c8c5151a01220a87) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Fix the docker image --no-trunk output formatHyzhou2016-04-111-10/+10
| | | | | | | docker 1.10 change the output format of image id. Signed-off-by: hyzhou.zhy <hyzhou.zhy@alibaba-inc.com> (cherry picked from commit b83e9df7609e705a85545a8a63db81ef73d85b0e)
* When using systemd, pass expected cgroupsPath and cli options to runc.Anusha Ragunathan2016-03-311-3/+4
| | | | | | | | | | runc expects a systemd cgroupsPath to be in slice:scopePrefix:containerName format and the "--systemd-cgroup" option to be set. Update docker accordingly. Fixes 21475 Signed-off-by: Anusha Ragunathan <anusha@docker.com> (cherry picked from commit 7ed3d265a4499ec03f10537fea0aac3ebaa0cec6)
* Mention "docker login" in push/pull documentationAaron Lehmann2016-03-312-0/+4
| | | | | | | | | | | It was suggested to me that documentation for "docker pull" and "docker push" should reference "docker login", to make clearer how to specify credentials for a push or pull operation. Add a note to the manual pages and reference documentation explaining how registry credentials are managed. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com> (cherry picked from commit fb5ea0c0efec238aeeff7c5c3742a0e4eccff2c7)
* docs for `docker daemon --containerd`Harald Albers2016-03-311-3/+4
| | | | | Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 75f0015c50fef03067c5d54097fb6eb8cb62200b)
* fix wrong option name in `dm.min_free_space` examplesHarald Albers2016-03-311-1/+1
| | | | | Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 2623b3496ead7c275d2e54bdfcdab0eab528be51)
* docs for labels on build, networks and volumesHarald Albers2016-03-313-0/+3
| | | | | Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 995e5beda74b99dfc920f6a79aee977ff5a15a72)
* add docs for `docker load --quiet`Harald Albers2016-03-251-0/+1
| | | | | Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 610ec8c7396ea4cc20465b99cf326684c82d23ff)
* Merge pull request #21367 from mlaventure/containerd-docs-cleanupTibor Vass2016-03-221-11/+13
|\ | | | | Remove unneeded references to execDriver
| * Remove unneeded references to execDriverKenfe-Mickael Laventure2016-03-211-11/+13
| | | | | | | | | | | | | | | | This includes: - updating the docs - removing dangling variables Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
* | Merge pull request #21383 from estesp/shared-userns-net-ipcDavid Calavera2016-03-221-3/+1
|\ \ | | | | | | Allow net and IPC namespaces to be shared when userns=on
| * | Allow net and IPC namespaces to be shared when userns=onPhil Estes2016-03-211-3/+1
| |/ | | | | | | | | | | | | | | | | Now that the namespace sharing code via runc is vendored with the containerd changes, we can disable the restrictions on container to container net and IPC namespace sharing when the daemon has user namespaces enabled. Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
* | Merge pull request #21223 from cpuguy83/add_nocp_to_volsTibor Vass2016-03-222-8/+8
|\ \ | | | | | | Add explicit flags for volume cp/no-cp
| * | Add explicit flags for volume cp/no-cpBrian Goff2016-03-212-8/+8
| |/ | | | | | | | | | | | | | | | | This allows a user to specify explicitly to enable automatic copying of data from the container path to the volume path. This does not change the default behavior of automatically copying, but does allow a user to disable it at runtime. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
* | Update 'save' command helpMartin Mosegaard Amdisen2016-03-221-1/+1
| | | | | | | | | | | | Based on review feedback. Signed-off-by: Martin Mosegaard Amdisen <martin.amdisen@praqma.com>
* | Fix plural typo in 'save' command helpMartin Mosegaard Amdisen2016-03-211-1/+1
|/ | | | | | | | | | | The form "Save an images" is not correct. Either "Save an image" or "Save images" work, but since the save commands accepts multiple images, I chose the latter. Fixed in all places where I could grep "Save an image(s)". Signed-off-by: Martin Mosegaard Amdisen <martin.amdisen@praqma.com>
* Fix typoZhang Wei2016-03-171-1/+1
| | | | Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
* Update Docker pull examplesSebastiaan van Stijn2016-03-161-24/+196
| | | | | | | | | | The old examples no longer worked due to changes in the client and Docker Hub. This updates the "docker pull" documentation and adds more examples and explanation of the features. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Merge pull request #21209 from HackToday/fixdocpsVincent Demeester2016-03-151-0/+1
|\ | | | | Add the missed volume filter
| * Add the missed volume filterKai Qiang Wu(Kennan)2016-03-151-0/+1
| | | | | | | | Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
* | Merge pull request #20786 from rhvgoyal/min-free-spaceVincent Batts2016-03-141-0/+26
|\ \ | | | | | | devmapper: Add a new option dm.min_free_space_percent
| * | devmapper: Add a new option dm.min_free_spaceVivek Goyal2016-03-071-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once thin pool gets full, bad things can happen. Especially in case of xfs it is possible that xfs keeps on retrying IO infinitely (for certain kind of IO) and container hangs. One way to mitigate the problem is that once thin pool is about to get full, start failing some of the docker operations like pulling new images or creation of new containers. That way user will get warning ahead of time and can try to rectify it by creating more free space in thin pool. This can be done either by deleting existing images/containers or by adding more free space to thin pool. This patch adds a new option dm.min_free_space to devicemapper graph driver. Say one specifies dm.min_free_space=10%. This means atleast 10% of data and metadata blocks should be free in pool before new device creation is allowed, otherwise operation will fail. By default min_free_space is 10%. User can change it by specifying dm.min_free_space=X% on command line. A value of 0% will disable the check. Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
* | | Run privileged containers when userns are specifiedLiron Levin2016-03-143-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following #19995 and #17409 this PR enables skipping userns re-mapping when creating a container (or when executing a command). Thus, enabling privileged containers running side by side with userns remapped containers. The feature is enabled by specifying ```--userns:host```, which will not remapped the user if userns are applied. If this flag is not specified, the existing behavior (which blocks specific privileged operation) remains. Signed-off-by: Liron Levin <liron@twistlock.com>
* | | Merge pull request #20970 from dmcgowan/login-oauthVincent Demeester2016-03-141-4/+7
|\ \ \ | | | | | | | | OAuth support for registries
| * | | Add support for identity tokens in client credentials storeAaron Lehmann2016-03-091-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update unit test and documentation to handle the new case where Username is set to <token> to indicate an identity token is involved. Change the "Password" field in communications with the credential helper to "Secret" to make clear it has a more generic purpose. Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
* | | | Include all endpoints in network inspect objectMadhu Venugopal2016-03-131-1/+4
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, the "docker network inspect" contains only the endpoints that have active local container. This excludes all the remote and stale endpoints. By including all the endpoints, it makes debugging much simpler and also allows the user to cleanup any stale endpoints using "docker network disconnect -f {network} {endpoint-name}". Signed-off-by: Madhu Venugopal <madhu@docker.com>
* | | docs: add $ before HOMEAntonio Murdaca2016-03-122-2/+2
| | | | | | | | | | | | Signed-off-by: Antonio Murdaca <runcom@redhat.com>
* | | Merge pull request #21045 from calavera/registry_config_optionsSebastiaan van Stijn2016-03-111-1/+4
|\ \ \ | | | | | | | | Move registry service options to the daemon configuration.
| * | | Move registry service options to the daemon configuration.David Calavera2016-03-101-1/+4
| | |/ | |/| | | | | | | | | | | | | Allowing to set their values in the daemon configuration file. Signed-off-by: David Calavera <david.calavera@gmail.com>
* | | Merge pull request #21043 from runcom/plugin-sdkSebastiaan van Stijn2016-03-101-1/+1
|\ \ \ | |_|/ |/| | docs: extend: plugins: mention the sdk + systemd socket activation
| * | docs: extend: plugins: mention the sdk + systemd socket activationAntonio Murdaca2016-03-101-1/+1
| |/ | | | | | | Signed-off-by: Antonio Murdaca <runcom@redhat.com>
* | Merge pull request #18697 from jfrazelle/pids-cgroupDavid Calavera2016-03-082-0/+2
|\ \ | | | | | | Add PIDs cgroup support to Docker
| * | pids limit supportJessica Frazelle2016-03-082-0/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | update bash commpletion for pids limit update check config for kernel add docs for pids limit add pids stats add stats to docker client Signed-off-by: Jessica Frazelle <acidburn@docker.com>
View Lorry Controller Status