centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-02 17:28:55 +07:00
Code Issues Packages Projects Releases Wiki Activity
18,148 Commits 55 Branches 28 Tags
3fdfbd43b671ff816979eac6397b0021f00a2800
Commit Graph

81 Commits

Author SHA1 Message Date
Sally O'Malley
73fe42e3db correct man docker-pull 
Signed-off-by: Sally O'Malley <somalley@redhat.com>
 2015-09-04 16:34:40 -04:00
Sebastiaan van Stijn
4a0606423b Merge pull request #16043 from sallyom/manDockerfile 
man Dockerfile ADD/COPY/FROM clarify
 2015-09-04 10:03:50 +02:00
Sally O'Malley
2d9ea188d4 clarify --insecure-registry in man docker 
Signed-off-by: Sally O'Malley <somalley@redhat.com>
 2015-09-03 17:10:40 -04:00
Sally O'Malley
48badd2a2e man Dockerfile ADD/COPY/FROM clarify 
Signed-off-by: Sally O'Malley <somalley@redhat.com>
 2015-09-03 09:08:25 -04:00
Antonio Murdaca
db4f20404d Remove PortMapping from container NetworkSettings 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-09-02 14:32:53 +02:00
Vincent Demeester
c1af0ac082 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>
 2015-08-26 22:59:48 +02:00
Brian Goff
b3b7eb2723 Add volume API/CLI 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-08-26 13:37:52 -04:00
Taylor Jones
936b2c6afe adding message option to the import subcommand 
Signed-off-by: Taylor Jones <monitorjbl@gmail.com>
 2015-08-25 02:55:04 +00:00
Brian Goff
fd8b25c802 Merge pull request #15348 from tonistiigi/11008-always-unless-stopped-restart-policy 
Add always-unless-stopped restart policy
 2015-08-24 13:48:56 -04:00
Qiang Huang
76a5fdc3d4 Change all optional unit to [unit] 
As suggested before, we should change every signal one.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-21 21:29:52 -07:00
Jessie Frazelle
9bd8a9b66b Merge pull request #14006 from hqhq/hq_add_kmem_limit 
Add support for kernel memory limit
 2015-08-21 14:34:27 -07:00
Sebastiaan van Stijn
ec43113662 Merge pull request #15697 from sallyom/man-commit-fix 
fix format man-commit
 2015-08-20 21:33:46 +02:00
Sven Dowideit
272a3eef94 Merge pull request #15696 from sallyom/man-history-fixup 
add -H to SYNOPSIS man-history
 2015-08-20 22:11:50 +10:00
Qiang Huang
b6f1b4ad35 Add support for kernel memory limit 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-19 23:56:55 +08:00
Sally O'Malley
ab9e71b616 fix format man-commit 
Signed-off-by: Sally O'Malley <somalley@redhat.com>
 2015-08-19 10:07:32 -04:00
Sally O'Malley
898114a6d0 add -H to SYNOPSIS man-history 
Signed-off-by: Sally O'Malley <somalley@redhat.com>
 2015-08-19 09:35:52 -04:00
moxiegirl
9f1e324b53 Merge pull request #15660 from sallyom/man-create-typo 
fix SYNOPSIS alphabetical order man-create
 2015-08-18 18:40:39 -07:00
Tonis Tiigi
10305dc5e8 Add unless-stopped restart policy 
Fixes #11008

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2015-08-18 11:39:06 -07:00
Sally O'Malley
df11b10680 typo man-inspect 
Signed-off-by: Sally O'Malley <somalley@redhat.com>
 2015-08-18 11:19:57 -04:00
Sally O'Malley
8b8413266c fix SYNOPSIS alphabetical order man-create 
Signed-off-by: Sally O'Malley <somalley@redhat.com>
 2015-08-18 08:16:57 -04:00
Sebastiaan van Stijn
e1f3a5ad0a Merge pull request #14113 from dit4c/10348-exec-privileged 
Remerge of `docker exec --privileged` with better tests
 2015-08-16 00:20:41 +02:00
Sebastiaan van Stijn
c6c195a465 Merge pull request #13501 from vdemeester/8048-image-repository-tag 
Fix #8048 : make `docker images repository:tag` work
 2015-08-13 21:36:21 +02:00
Vincent Demeester
4fb88d2e11 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>
 2015-08-13 08:50:09 +02:00
Tim Dettrick
90326939c8 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>
 2015-08-13 16:37:20 +10:00
Tim Dettrick
03f65b3d0d Revert "Revert "Add docker exec run a command in privileged mode"" 
This reverts commit 40b71adee3.

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

Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au>
 2015-08-13 16:36:44 +10:00
David Calavera
d50881e446 Merge pull request #15449 from albers/completion-help 
Remove -h flag from completion and daemon reference
 2015-08-12 17:09:51 -07:00
Harald Albers
ceb11d9660 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>
 2015-08-11 07:30:58 -07:00
Qiang Huang
81cc8ebc93 Change all docker -d to docker daemon 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-08-10 20:48:08 +08:00
moxiegirl
be07c53d2d Merge pull request #15259 from sallyom/manFixes 
make man/docker.1.md consistent with docker --help
 2015-08-04 08:34:52 -07:00
Sally O'Malley
f3bea61c80 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>
 2015-08-03 15:12:33 -04:00
Sally O'Malley
70ac38025c Typo fix: man/docker-tag.1.md 
Signed-off-by: Sally O'Malley <somalley@redhat.com>
 2015-08-03 12:51:10 -04:00
Zhang Wei
6a4ac63aaa Docker stats: display Block IO stats 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-07-31 21:26:32 +08:00
Otto Kekäläinen
b619220ce1 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>
 2015-07-30 10:14:57 +03:00
Jessie Frazelle
5329d28536 Merge pull request #14971 from moxiegirl/man-page-carry-14637 
Carry man page for the load command
 2015-07-27 10:18:44 -07:00
Denis Ollier
9356049680 Fix docker-rm man page formatting 
Signed-off-by: Denis Ollier <larchunix@users.noreply.github.com>
 2015-07-26 04:18:48 +02:00
Mary Anthony
ae45ffc1fe Carry man page for 14637 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-07-24 13:39:29 -07:00
Lei
877dbbbde8 Add ulimit to docker build. 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-07-23 10:26:06 +08:00
Sebastiaan van Stijn
933d9f2e0d Merge pull request #14799 from coolljt0725/docs_fix_devicemapper_default_basesize 
Docs: update the devicemapper default basesize from 10G to 100G
 2015-07-22 22:07:38 +02:00
David Calavera
40b922418c Merge pull request #14699 from estesp/docker-ps-format 
Carry #10255: Docker ps format
 2015-07-22 10:58:34 -07:00
Phil Estes
542b58d8f7 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)
 2015-07-22 12:51:16 -04:00
Sebastiaan van Stijn
50d2597e49 Merge pull request #13711 from calavera/version_volumes_inspect 
Expose new mount points structs in inspect.
 2015-07-22 09:02:00 +02:00
Jessie Frazelle
dda1d66ac7 Merge pull request #14808 from cpuguy83/bump_md2man 
Bump go-md2man to 1.0.3
 2015-07-21 19:53:26 -07:00
David Calavera
1c3cb2d31e Expose new mount points structs in inspect. 
Keep old hashes around for old api version calls.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-07-21 15:33:05 -07:00
Josh Hawn
e54b1e081a docs: Updated for docker cp and its API changes 
Documented changes to API to enable new `docker cp` behavior.

Added documentation on `docker cp` usage and behavior.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-07-21 15:30:20 -07:00
Brian Goff
dd7d4d1101 Bump go-md2man to 1.0.3 
Fixes an issue with curly braces being escaped when they should not be.
This was particularly an issue in places where `--format '{{ ...  }}'`
is used in the man docs.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-07-21 10:42:02 -04:00
Lei
36cc6a985b Docs: update the devicemapper default basesize from 10G to 100G 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-07-21 20:46:31 +08:00
David Calavera
37209190c7 Docker ps custom formatting. 
Docker-DCO-1.1-Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-07-20 22:46:55 -04:00
Dan Walsh
732141442a Fix man pages 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-07-20 11:47:59 -04:00
Sebastiaan van Stijn
899f6f2a89 Merge pull request #14252 from sallyom/docs-use-lowercase 
Modify man pages for image-naming
 2015-07-14 18:34:36 +02:00
Qiang Huang
c3b77bbe8b Docs: fix commandline doc create.md and run.md 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-07-14 09:26:59 +08:00