1
0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Commit Graph

572 Commits

Author SHA1 Message Date
Simei He
8ef90f8053 minor edits.
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 097e382e78
Component: cli
2017-06-02 00:06:53 +00:00
dalanlan
2b59eb2a38 fix issue #11676 #11754, disable RLIMIT_AS,edit DOCKER_OPTS
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: a4c88adc4d
Component: cli
2017-06-02 00:06:53 +00:00
Deng Guangxing
87d832f221 fix typo in cli.md
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: e2ecc5c6de
Component: cli
2017-06-02 00:06:53 +00:00
Sebastiaan van Stijn
89f22b4397 docs: fix bullet list and missing label filter
Some bullet lists didn't render as bullet-lists because
of a missing newline.

Also added missing "label" filter for `docker ps` and
slightly re-worded the header above the supported filters.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 48add9c908
Component: cli
2017-06-02 00:06:53 +00:00
Lei Jitang
f7e21a2b4b Add some missing option to bash completion
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 26c3652d5e
Component: cli
2017-06-02 00:06:53 +00:00
Doug Davis
14004cb76b Add support for more advanced ${xxx:...} syntax
Just ${xxx:+...} and ${xxx:-...} for now

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: efc478e33c
Component: cli
2017-06-02 00:06:52 +00:00
Sebastiaan van Stijn
2568ea2e48 Fix heading level of logging drivers
Syslog was a heading-2, but should be heading-3;
changed the headings to heading-4 to match the
"network settings" section.

Also changed "Log driver" to "logging driver" for JSON.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 07995c4ef3
Component: cli
2017-06-02 00:06:52 +00:00
Harry Zhang
b86e6831ba Revison the some columns to make table clearer
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
Upstream-commit: 5ed0d9c3de
Component: cli
2017-06-02 00:06:52 +00:00
Harry Zhang
4d0c23a8b2 Remove dupllicated prefix to make table shorter & fix bugs
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
Upstream-commit: 5b000494ee
Component: cli
2017-06-02 00:06:52 +00:00
cheney90
cf5a6d43f7 Add capabilities list information table.
Signed-off-by: Chen Qiu <21321229@zju.edu.cn>
Upstream-commit: 0864264159
Component: cli
2017-06-02 00:06:52 +00:00
Harald Albers
e326deef86 Add missing filters to bash completion for docker images and docker ps
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d0fefccd8d
Component: cli
2017-06-02 00:06:52 +00:00
Harald Albers
8a9d154752 Do not complete --cgroup-parent as _filedir
This is a follow-up on PR 11708, as suggested by tianon.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 4d5758b252
Component: cli
2017-06-02 00:06:52 +00:00
Daniel, Dao Quang Minh
03dc80863d document dirperm1 fix for #783 in known issues
Since `dirperm1` requires a more recent aufs patch than many current OS release,
we cant remove #783 completely. This documents that docker will apply `dirperm1`
automatically for systems that support it

Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
Upstream-commit: 729035faff
Component: cli
2017-06-02 00:06:52 +00:00
Ankush Agarwal
4bfc1c3bca Explain --net=host option usage
Fixes #11630

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 7ac28ecb2c
Component: cli
2017-06-02 00:06:52 +00:00
John Willis
83fec2a376 #11465 Add additional doc for locagi registries onn pull command
Signed-off-by: John Willis <john.willis@docker.com>
Upstream-commit: e1cbe1c398
Component: cli
2017-06-02 00:06:52 +00:00
Ankush Agarwal
0f62af11ba Add Glossary to documentation
Closes #11057

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 5dad1f409f
Component: cli
2017-06-02 00:06:52 +00:00
Michael West
293fc1d57e Add a missing definite article
Signed-off-by: Michael West <mwest@mdsol.com>
Upstream-commit: 229fa7b7b9
Component: cli
2017-06-02 00:06:52 +00:00
Michael West
3ac223b9b7 Add man pages generation instructions.
Signed-off-by: Michael West <mwest@mdsol.com>
Upstream-commit: 443da2a625
Component: cli
2017-06-02 00:06:52 +00:00
Lei Jitang
71f6d6f041 Add some run option to bash completion
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 984a0d8dee
Component: cli
2017-06-02 00:06:52 +00:00
Mary Anthony
4fa12af301 Removing sudo from command line examples
We now advise people to configure docker group and
add to sudo.  Mac shouldn't use sudo.  Removed sudo
from command examples.  Left in installation to be removed
in installation doc sweep -- removing requires finer
grain control.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: fb7eb87b94
Component: cli
2017-06-02 00:06:52 +00:00
Mary Anthony
f979089af6 Removing sudo from examples
We now have instructions in our Unix installs about setting up
docker group to avoid sudo.  Also, Mac/Windows shouldn't use
sudo.  So, I've removed sudo from our examples and added a
section at the top reminding them that if they have to use
sudo to run docker they can change that.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: c4323175d9
Component: cli
2017-06-02 00:06:52 +00:00
Ankush Agarwal
7ad0b821b5 Rename Fds to File Descriptors in docker info
This makes the docker info more readable. Also change a log line
in a test file renaming Fds

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: bce6adadff
Component: cli
2017-06-02 00:06:52 +00:00
Vincent Batts
728ca1f0bb .: remove trailing white spaces
blame tibor this one ;-)
```
find . -type f -not -name '*.png' -not -name '*.go' -not -name '*.md'
-not -name '*.tar' -not -name '*.pem' -not -path './vendor/*' -not -path
'./.git/*' -not -path '*/testdata/*' -not -path './docs/*images*' -not
-path '*/testfiles/*' -not -path './bundles/*' -not -path
'./docs/*static*/*' -not -path './docs/*article-img/*' -exec grep -HnEl
'[[:space:]]$' {} \; | xargs sed -iE 's/[[:space:]]*$//'
```

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 1bca003519
Component: cli
2017-06-02 00:06:51 +00:00
Tibor Vass
dba480a36b Revert "Dealing with trailing whitespaces"
The validation script from #10681 is too pedantic, and does not handle
well situations like:

```
cat <<EOF   # or <<-EOF
	Whether the leading whitespace is stripped out or not by bash
	it should still be considered as valid.
EOF
```

This reverts commit 4e65c1c319afffc325853b88c9aef0c42ec83482.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 3574eda4c1
Component: cli
2017-06-02 00:06:51 +00:00
Doug Davis
0b778adb78 Add some info about what environment variables are available
Having the list in one spot makes it easier for people to see what's
avaiable instead of having to scan all of the docs and extract the info.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: d25b8ec297
Component: cli
2017-06-02 00:06:51 +00:00
Qiang Huang
56ba763d48 add cpuset and examples to run.md
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 7618ff84f8
Component: cli
2017-06-02 00:06:51 +00:00
Qiang Huang
e97ca146b6 docs: add memory and swap memory usage examples
fix: https://github.com/docker/docker/issues/11629

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 645b49d05b
Component: cli
2017-06-02 00:06:51 +00:00
André Martins
05cd256c83 Dealing with trailing whitespaces
Created a validation that detects all trailing whitespaces from every
text file that isn't *.go, *.md, vendor/*,
docs/theme/mkdocs/tipuesearch*

Removed trailing whitespaces from every text file except from vendor/*
builder/parser/testfiles*, docs/theme/mkdocs/tipuesearch* and *.md

Signed-off-by: André Martins <martins@noironetworks.com>
Upstream-commit: 1f934f1094
Component: cli
2017-06-02 00:06:51 +00:00
jimmyxian
64fd7feaca fix docker ps help message
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
Upstream-commit: 653fdbc2f8
Component: cli
2017-06-02 00:06:51 +00:00
Natalie Parker
5d40224f3e Added missing code example in the RM command reference of command to delete all stopped containers
Signed-off-by: Natalie Parker <nparker@omnifone.com>
Upstream-commit: 886b571641
Component: cli
2017-06-02 00:06:51 +00:00
Harald Albers
75d1a0ff30 restrict bash completion for hostdir arg to directories
The previous state assumed that the HOSTPATH argument referred to a
file. As clarified by moxiegirl in PR #11305, it is a directory.
Adjusted completion to reflect this.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: fc2a7eea91
Component: cli
2017-06-02 00:06:51 +00:00
sidharthamani
8ece884edf add syslog driver
Signed-off-by: wlan0 <sid@rancher.com>
Upstream-commit: 72bb856565
Component: cli
2017-06-02 00:06:51 +00:00
Doug Davis
39d8bc547c Fix some escaping around env var processing
Clarify in the docs that ENV is not recursive

Closes #10391

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: f32b6eb23c
Component: cli
2017-06-02 00:06:51 +00:00
Peter Waller
1e74a9742a Implement build cancellation
Add the capability to cancel the build by disconnecting the client.

This adds a `cancelled` channel which is used to signal that a build
should halt. The build is halted by sending a Kill signal and noticing
that the cancellation channel is closed.

This first pass implementation does not allow cancellation during a
pull, but that will come in a subsequent PR.

* Add documentation of cancellation to cli and API

* Protect job cancellation with sync.Once

* Add TestBuildCancelationKillsSleep

* Add test case for build cancellation of RUN statements.

Signed-off-by: Peter Waller <p@pwaller.net>
Upstream-commit: e9942aeb8a
Component: cli
2017-06-02 00:06:51 +00:00
Lloyd Dewolf
ed9cbed2b2 doc: reference/run introduce -it .
Also:
- Fix "docker" cmd always "sudo docker" for docs.
- Fix "-ti" with "-it".
- fix "/docker" typo.

Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com>
Upstream-commit: f672cb24cb
Component: cli
2017-06-02 00:06:51 +00:00
Mary Anthony
21300d2002 Updating in light of new contributors guide
Link to new guide. Added a quickstart contributor guide for experienced people.
Converting narrative style to procedures for easier use. I think there is something missing in the
release publishing section...but it looks like it was missing in the original.
Updates per thaJeztah
Edits per Fred
Updating with comments from Sven

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: fc39612aaa
Component: cli
2017-06-02 00:06:51 +00:00
Todd Whiteman
a3a26dede6 docs: cli: reorder rename command to be in alphabetical order
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
Upstream-commit: 698b8d3ed0
Component: cli
2017-06-02 00:06:51 +00:00
Ma Shimiao
0f6be90129 fix wrong tab completion
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: f86dcef486
Component: cli
2017-06-02 00:06:51 +00:00
Harald Albers
c9fcb9fc79 Remove 'name' filter from docker events documentation
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: fe7a340316
Component: cli
2017-06-02 00:06:51 +00:00
Vishnu Kannan
d0069fd287 Adding integration tests for --cgroup-parent feature.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: d3a6b5adff
Component: cli
2017-06-02 00:06:50 +00:00
Vishnu Kannan
59ef98f403 Adding documentation for '--cgroup-parent' option.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: ae117d58d4
Component: cli
2017-06-02 00:06:50 +00:00
Brian Goff
e6d3f9945a Allow setting resource constrains for build
Closes #10191

Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: edc7c88640
Component: cli
2017-06-02 00:06:50 +00:00
Joseph Kern
dc6dc9b463 Modified docker export to allow an --output flag
Copied code from CmdSave into CmdExport. This should work, not an expert in the API calls being made. But it does make more sense to have a consistent export/save flag.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

checkpoint before edits on the export functions

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added an --output flag to docker export and created tests.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

White space cleanup.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Docker-DCO-1.1-Signed-off-by: Joseph Kern <jkern@semafour.net> (github: jfrazelle)

checkpoint before edits on the export functions

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

White space cleanup.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added text to reflect a new output option for the export command.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Whitespace clean up

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added man page documentation for the new --output flag in export

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
Upstream-commit: 4aa65f26aa
Component: cli
2017-06-02 00:06:50 +00:00
Mary Anthony
c59266e9ae Clarify behavior of docker cp
The STDOUT behavior of cp is not yet released in 1.50 so removed.
Also, tested against 1.5 all other behaviors and extended documentation to match.
Renamed HOSTPATH to HOSTDIR to give a self documenting name.

Adding back in the references to STDOUT
fix the command string
Entering Doug's comment re append and ~/tmp/foo in the glass
Adding in Doug's comments regarding PATHs and missing |-
Updating with James comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f1cb33631f
Component: cli
2017-06-02 00:06:50 +00:00
Harald Albers
edbfd74dae Updates to bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e2b5fc47e3
Component: cli
2017-06-02 00:06:50 +00:00
Mary Anthony
ff8aabb69e Updating with Sven's comments and other tweaks
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: ade615a458
Component: cli
2017-06-02 00:06:50 +00:00
Alexander Morozov
37e848aecb Fail docker logs on all logging drivers apart from 'json-file'
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e30532cf3f
Component: cli
2017-06-02 00:06:50 +00:00
Alexander Morozov
2fb4844dac Default 'json-file' logging driver and none logging driver
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 1459501312
Component: cli
2017-06-02 00:06:50 +00:00
Andy Goldstein
409acea418 Add ability to refer to image by name + digest
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
Upstream-commit: 2eaa831df5
Component: cli
2017-06-02 00:06:50 +00:00
Darren Shepherd
3320d5612e Documentation changes for labels
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: bfca1f4258
Component: cli
2017-06-02 00:06:50 +00:00