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

89 Commits

Author SHA1 Message Date
David Calavera
1e38e54eff Add STOPSIGNAL instruction to dockerfiles.
This way, images creators can set the exit signal their programs use.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3781cde61ff10b1d9114ae5b4c5c1d1b2c20a1ee
Component: engine
2015-09-10 19:56:05 -04:00
David Calavera
d563cc164c Signal to stop a container.
Allow to set the signal to stop a container in `docker run`:
- Use `--stop-signal` with docker-run to set the default signal the container will use to exit.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0e50d946a25beb134bce2aaf4a209b5cfcbacf8f
Component: engine
2015-09-10 19:56:05 -04:00
David Calavera
b09dc49663 Merge pull request #15495 from samuelkarp/awslogs-logging-driver
Add awslogs driver for Amazon CloudWatch Logs
Upstream-commit: 9f517fc5bb95758d66a0c9d48ae9ece202352948
Component: engine
2015-09-09 17:19:39 -07:00
Samuel Karp
56082f8faa Add awslogs driver for Amazon CloudWatch Logs
Signed-off-by: Samuel Karp <skarp@amazon.com>
Upstream-commit: 3effe484e6f572298d0c3490517f57391617aa51
Component: engine
2015-09-09 13:52:40 -07:00
Harald Albers
fb110ef322 update docker volume man pages
- added --help option
- fixed several formatting problems

Also added --help to volume inspect reference page.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2724010364e6d7d316a244ae37850e8c91abb87c
Component: engine
2015-09-09 19:16:39 +02:00
Sebastiaan van Stijn
693377fda5 Merge pull request #16053 from sallyom/man-docker-tag
man docker-tag minor fixup
Upstream-commit: ab197f7ad220b095696e94765a437750885a542f
Component: engine
2015-09-08 21:45:27 +02:00
Harald Albers
c50d0a0555 Fix usage for docker volume inspect and docker volume rm
For both commands, volume is _not_ optional. Several volumes may
be specified.
Both commands now use the same name (VOLUME) for the command argument.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 00eaa7e1f53d9100e95af80d8a05f8e77e380464
Component: engine
2015-09-08 09:14:57 -07:00
Sally O'Malley
a0777d04f5 correct man docker-pull
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 73fe42e3db040787761691a930fce7bf322febe6
Component: engine
2015-09-04 16:34:40 -04:00
Sally O'Malley
f503e6ac02 man docker-tag minor fixup
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 9c3aafd354c3c3c1c53a91cce187ac3025bfc7e3
Component: engine
2015-09-04 10:10:03 -04:00
Sebastiaan van Stijn
a2884da2ba Merge pull request #16043 from sallyom/manDockerfile
man Dockerfile ADD/COPY/FROM clarify
Upstream-commit: 4a0606423bc6ab3195bfddafcff2cea9a6135622
Component: engine
2015-09-04 10:03:50 +02:00
Sally O'Malley
4a69dd626d clarify --insecure-registry in man docker
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 2d9ea188d4625ee77d5864590ffde6cff4fe0031
Component: engine
2015-09-03 17:10:40 -04:00
Sally O'Malley
43e93c7ce3 man Dockerfile ADD/COPY/FROM clarify
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 48badd2a2e3a6712baa6fce1e97e87e1feb3dc38
Component: engine
2015-09-03 09:08:25 -04:00
Antonio Murdaca
262b85d1ce Remove PortMapping from container NetworkSettings
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: db4f20404d2b8c4da5a15e447f52cd634445cfe3
Component: engine
2015-09-02 14:32:53 +02:00
Vincent Demeester
e191a06015 Add 'ancestor' ps filter for image
Makes it possible to filter containers by image, using
--filter=ancestor=busybox and get all the container running busybox
image and image based on busybox (to the bottom).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c1af0ac0820d1385fe2ee65593b0558840395c7b
Component: engine
2015-08-26 22:59:48 +02:00
Brian Goff
bfe1bbc7d2 Add volume API/CLI
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b3b7eb2723461b1eb4be692f4bced0ae8ea9cb58
Component: engine
2015-08-26 13:37:52 -04:00
Taylor Jones
15378abfc2 adding message option to the import subcommand
Signed-off-by: Taylor Jones <monitorjbl@gmail.com>
Upstream-commit: 936b2c6afe490b562df4ebea854b116c3b40a9f5
Component: engine
2015-08-25 02:55:04 +00:00
Brian Goff
83ec490c79 Merge pull request #15348 from tonistiigi/11008-always-unless-stopped-restart-policy
Add always-unless-stopped restart policy
Upstream-commit: fd8b25c802780683cc5776e6d3aaca9536e7370b
Component: engine
2015-08-24 13:48:56 -04:00
Qiang Huang
8d277bea0f Change all optional unit to [unit]
As suggested before, we should change every signal one.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 76a5fdc3d429030bcfdce1a52a17383c2bf2f71b
Component: engine
2015-08-21 21:29:52 -07:00
Jessie Frazelle
26bf545a48 Merge pull request #14006 from hqhq/hq_add_kmem_limit
Add support for kernel memory limit
Upstream-commit: 9bd8a9b66bb493026599d22c7637909cb460d039
Component: engine
2015-08-21 14:34:27 -07:00
Sebastiaan van Stijn
c83772f751 Merge pull request #15697 from sallyom/man-commit-fix
fix format man-commit
Upstream-commit: ec43113662ad793d28cf4657deba6b44de61d3b9
Component: engine
2015-08-20 21:33:46 +02:00
Sven Dowideit
9edc367ed4 Merge pull request #15696 from sallyom/man-history-fixup
add -H to SYNOPSIS man-history
Upstream-commit: 272a3eef9454236328b728ac43b0382142f00ecb
Component: engine
2015-08-20 22:11:50 +10:00
Qiang Huang
3004521c7f Add support for kernel memory limit
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: b6f1b4ad350cbf1f540797eee44520694237d47c
Component: engine
2015-08-19 23:56:55 +08:00
Sally O'Malley
cc1d2ef1b9 fix format man-commit
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: ab9e71b6167e636c01c7a82726f1de4e74a48607
Component: engine
2015-08-19 10:07:32 -04:00
Sally O'Malley
15ace5e739 add -H to SYNOPSIS man-history
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 898114a6d010cabdbbac77386af2d94ceabd939c
Component: engine
2015-08-19 09:35:52 -04:00
moxiegirl
17775654ce Merge pull request #15660 from sallyom/man-create-typo
fix SYNOPSIS alphabetical order man-create
Upstream-commit: 9f1e324b53a1f278f5c3090fbb0fa80fdb2521da
Component: engine
2015-08-18 18:40:39 -07:00
Tonis Tiigi
2bf42179ec Add unless-stopped restart policy
Fixes #11008

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 10305dc5e8cc7e2e1560ce2abe93c17e923a1c47
Component: engine
2015-08-18 11:39:06 -07:00
Sally O'Malley
e63dc93f56 typo man-inspect
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: df11b10680f12969c5f0dc98fdee3bccf64f1f2b
Component: engine
2015-08-18 11:19:57 -04:00
Sally O'Malley
98681bccab fix SYNOPSIS alphabetical order man-create
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 8b8413266c303ad5b11e3458784a393417979036
Component: engine
2015-08-18 08:16:57 -04:00
Sebastiaan van Stijn
f2f5327a6e Merge pull request #14113 from dit4c/10348-exec-privileged
Remerge of `docker exec --privileged` with better tests
Upstream-commit: e1f3a5ad0aade527c1b00385652aec21d1cf09ac
Component: engine
2015-08-16 00:20:41 +02:00
Sebastiaan van Stijn
f1cc5568e9 Merge pull request #13501 from vdemeester/8048-image-repository-tag
Fix #8048 : make `docker images repository:tag` work
Upstream-commit: c6c195a465652e96b06e76b44a1df075cba9ad80
Component: engine
2015-08-13 21:36:21 +02:00
Vincent Demeester
d024131050 Fix #8048 : make docker images repository:tag work
Make command like "docker images ubuntu:14.04" work and filter out the
image with the given tag.

Closes #8048.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4fb88d2e11f2f16c520b36e4c6e00db44ae26b8c
Component: engine
2015-08-13 08:50:09 +02:00
Tim Dettrick
273be038ad Updated test to check for exec --privileged side-effects
Also improving documentation for same feature as part of
docker/docker#14113 docs review.

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
Upstream-commit: 90326939c8089dbd7b59423415bc67cae6208b08
Component: engine
2015-08-13 16:37:20 +10:00
Tim Dettrick
337be087f4 Revert "Revert "Add docker exec run a command in privileged mode""
This reverts commit 40b71adee390e9c06471b89ed845132b4ec80177.

Original commit (for which this is effectively a rebased version) is
72a500e9e5929b038816d8bd18d462a19e571c99 and was provided by Lei Jitang
<leijitang@huawei.com>.

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
Upstream-commit: 03f65b3d0d66ccdc8b69a447b75508d594007600
Component: engine
2015-08-13 16:36:44 +10:00
David Calavera
534bcd14d8 Merge pull request #15449 from albers/completion-help
Remove -h flag from completion and daemon reference
Upstream-commit: d50881e446c4f230099e41124fda481849e82222
Component: engine
2015-08-12 17:09:51 -07:00
Harald Albers
f68b6c3486 Remove -h flag from completion and daemon reference
All docker subcommands support `-h` as an alias for `--help`
unless they have `-h` aliased to something else like `docker run`,
which uses `-h` for `--hostname`.

`-h` is not included in the help messages of the commands, though.

It ist visible in
* reference: only in `docker daemon` reference,
  see output of `grep -Rse --help=false docs`
* man pages: only in `docker` man page
  see output of `grep -RF '**-h**' man`

For consistency reasons, this commit removes `-h` as an alias for
`--help` from the reference page, man page and the bash completion.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ceb11d966034f4b4308abf4fc2826b4c840b6e99
Component: engine
2015-08-11 07:30:58 -07:00
Qiang Huang
8120b4d8fe Change all docker -d to docker daemon
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 81cc8ebc93c20537d5fab4c016a3774f58b3e483
Component: engine
2015-08-10 20:48:08 +08:00
moxiegirl
ea3fc05262 Merge pull request #15259 from sallyom/manFixes
make man/docker.1.md consistent with docker --help
Upstream-commit: be07c53d2d2d5aafde85068ed98a8e4b202e8978
Component: engine
2015-08-04 08:34:52 -07:00
Sally O'Malley
4b0a938070 make man/docker.1.md consistent with docker --help
"Options:" listed when you run "docker --help" and "docker daemon
--help" do not match the options listed in "man/docker.1.md".  This PR
makes 'docker --help', 'docker daemon --help' and 'man docker' consistent.
Also 2 typo fixes.

Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: f3bea61c8011e177e9035325e2007865994d838d
Component: engine
2015-08-03 15:12:33 -04:00
Sally O'Malley
79561d0a17 Typo fix: man/docker-tag.1.md
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 70ac38025cdd58bbf795b3a0bc47814dc4fd937d
Component: engine
2015-08-03 12:51:10 -04:00
Zhang Wei
712ef17493 Docker stats: display Block IO stats
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 6a4ac63aaac829e94c7d6cbb31a8d36b93757620
Component: engine
2015-07-31 21:26:32 +08:00
Otto Kekäläinen
eaafbe08a2 Multiple fixes to 'docker stats' output:
* Add space between values in docker stats output for easier parsing

  Old output could not be parsed easily because there were columns
  that did not have any separator. Also values that are together
  without any space is difficult to read even for humans.

* Update unit.HumanSize comment to match what the does actually does

Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
Upstream-commit: b619220ce11770ffaea068b54d3975c74f7c24f9
Component: engine
2015-07-30 10:14:57 +03:00
Jessie Frazelle
e610dff696 Merge pull request #14971 from moxiegirl/man-page-carry-14637
Carry man page for the load command
Upstream-commit: 5329d28536c5b75a42d5cb54a5b21e1f8791e914
Component: engine
2015-07-27 10:18:44 -07:00
Denis Ollier
eda33e0513 Fix docker-rm man page formatting
Signed-off-by: Denis Ollier <larchunix@users.noreply.github.com>
Upstream-commit: 93560496806c2f7fad273fe83d936c898bc7ab9e
Component: engine
2015-07-26 04:18:48 +02:00
Mary Anthony
7b2dff75e4 Carry man page for 14637
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: ae45ffc1feef4f2d859f7083a8d64a42c0e74c73
Component: engine
2015-07-24 13:39:29 -07:00
Lei
b278b668e9 Add ulimit to docker build.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 877dbbbde8aaf6583a81d9946e4c83db8e356b1a
Component: engine
2015-07-23 10:26:06 +08:00
Sebastiaan van Stijn
90d69c37a6 Merge pull request #14799 from coolljt0725/docs_fix_devicemapper_default_basesize
Docs: update the devicemapper default basesize from 10G to 100G
Upstream-commit: 933d9f2e0d61345a11f272487a223f4085bb798a
Component: engine
2015-07-22 22:07:38 +02:00
David Calavera
b066063905 Merge pull request #14699 from estesp/docker-ps-format
Carry #10255: Docker ps format
Upstream-commit: 40b922418cd48f8b414d8e10fdd72ed2095697e1
Component: engine
2015-07-22 10:58:34 -07:00
Phil Estes
e60763fbc1 ps --format: Add config.js doc, fix gofmt, add integration tests
Re-add the docs from @calavera's PR to the moved cli cmd reference docs.
Fix gofmt and vet issues from carried commits
Add integration test for using format with --no-trunc and multi-names
Fix custom_test map order dependency on expected value check
Add docs to reference/commandline/ps.md
Remove "-F" flag option from original carried PR content

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 542b58d8f7a2ff3b78a71b7d2c3145dd79f1fa97
Component: engine
2015-07-22 12:51:16 -04:00
Sebastiaan van Stijn
2d8d0361a7 Merge pull request #13711 from calavera/version_volumes_inspect
Expose new mount points structs in inspect.
Upstream-commit: 50d2597e490c4636ee8cacabf34bb9ed3e21d3fc
Component: engine
2015-07-22 09:02:00 +02:00
Jessie Frazelle
80e518f328 Merge pull request #14808 from cpuguy83/bump_md2man
Bump go-md2man to 1.0.3
Upstream-commit: dda1d66ac768a8be92ff6756cca4afcde3489fcf
Component: engine
2015-07-21 19:53:26 -07:00