0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13563 commits 14 branches 412 tags 338 MiB
Commit graph

422 commits

Author SHA1 Message Date
moxiegirl
faa6fd40f4 Merge pull request #11097 from thaJeztah/11069-run-reference-restart-policies 
Docs: add restart-policies to 'Run reference'
 2015-03-06 22:08:29 -08:00
Zhang Wentao
06a40f0f28 docker info display http/https_proxy setting 
Signed-off-by: Zhang Wentao <zhangwentao234@huawei.com>
 2015-03-06 09:02:21 +08:00
Sebastiaan van Stijn
8833779ae0 Docs: add restart-policies to 'Run reference' 
This moves some information on restart-policies from
the "command line" page to "run reference".

Also fixes some minor typos and adds a "NOTE"
about --rm and --restart not allowed to be combined.

Also removes inline CSS styles from tables,
which will be styled by the stylesheet, and fixes
some minor MarkDown errors (`<` -> &lt;)

depends on https://github.com/docker/docs-base/pull/1

resolves #11069

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-03-05 01:13:53 +01:00
Jessie Frazelle
7b3ffd5cc0 Merge pull request #10586 from resouer/10532-fix-cors-hardcode 
Fix 10532 to change --api-enable-cors to string.
 2015-03-04 18:42:20 +00:00
Jessie Frazelle
ffc755ac14 Merge pull request #11134 from duglin/CheckMultiLineHelp 
Fix 'docker ps --help' so the options don't span more than one line
 2015-03-04 05:53:47 -08:00
Jessie Frazelle
df7ba57f5f Merge pull request #9437 from cpuguy83/set_rlimits_in_container 
Allow setting ulimits for containers
 2015-03-04 04:00:17 -08:00
Jessie Frazelle
beea697be3 Merge pull request #10858 from duglin/10807-MixedcaseDockerfile 
Support dockerfile and Dockerfile
 2015-03-04 03:52:49 -08:00
Doug Davis
15924f2385 Support dockerfile and Dockerfile 
Closes #10807

Adds support for `dockerfile` ONLY when `Dockerfile` can't be found.
If we're building from a Dockerfile via stdin/URL then always download
it a `Dockerfile` and ignore the -f flag.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-03 18:38:50 -08:00
Sven Dowideit
93c82360a6 Notes should be indented 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-03-03 13:58:35 -08:00
Doug Davis
5595da2bde Fix 'docker ps --help' so the options don't span more than one line 
and add a testcase to catch this in the future.

While in there I also:
- removed extra periods from the few options that had them (new test)
- made the --filter option consistent across all command

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-03 10:02:23 -08:00
resouer
f3dd2db4ff Add cors header flag and leave boolean flag not changed 
Deprecate api-enable-cors

Update docs & man files

Signed-off-by: harry zhang <resouer@163.com>
 2015-03-03 11:21:19 +08:00
Dmitry Gusev
39b3690ba1 Update cli.md 
Use `-it` combination in example instead of `-ti`, because this is how it used everywhere in examples.

Update dockerfile_best-practices.md

Fix typo in command name

Signed-off-by: Dmitry Gusev <dmitry.gusev@gmail.com>
 2015-02-27 23:18:32 +03:00
Jessie Frazelle
94553f1ba6 Merge pull request #10902 from estesp/10855-fix-add-host-doc 
Correct --add-host documentation regarding host IP address retrieval
 2015-02-26 17:25:01 -08:00
Brian Goff
3f39050637 Allow setting ulimits for containers 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-02-25 19:37:43 -05:00
Michael Crosby
9a2e58dd29 Merge pull request #10498 from ashahab-altiscale/9875-lxc-stats 
Implements stats for lxc driver
 2015-02-25 13:46:18 -08:00
Phil Estes
f8a146311d Correct --add-host documentation regarding host IP address retrieval 
Fixes: 10855

The example was actually incorrect for many situations, and also, now
that we have IPv6 we should not that the example is for IPv4 and note
how to find IPv6 addresses.  Also, the device they want to connect to
could be the bridge, or main ethernet device, or some other device
name, so note that as well.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-02-25 09:56:58 -05:00
Dan Walsh
17abfc3ddc pass --change changes to the import job 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-02-24 13:01:36 -05:00
Dan Walsh
5767548fa7 add docs for commit --change 
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-02-24 13:01:36 -05:00
Alexander Morozov
02c8881596 Merge pull request #10933 from ahmetalpbalkan/version-daemon-os-arch 
cli: Add server OS/Arch info to 'version' cmd
 2015-02-23 15:26:53 -08:00
Ahmet Alp Balkan
3346c2e4d9 cli: Add server OS/Arch info to 'version' cmd 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-02-23 14:32:25 -08:00
Abin Shahab
1a26ed09ee Implements stats for lxc driver 
Implements stats and fixes stats test.

Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
 2015-02-23 10:16:52 +00:00
Brian Goff
4f0429621c Remove CLI doc entry related to API-only function 
Closes #10278

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-02-20 11:51:42 -05:00
Jessie Frazelle
934535db9c Merge pull request #10468 from noironetworks/10457-Pause-and-unpause-accept-multi-containers 
Allow docker pause and unpause to accept multiple containers
 2015-02-19 15:16:05 -08:00
Steve Francia
1875cc2ef4 Merge pull request #10835 from jfrazelle/port-ranges 2015-02-19 16:11:59 -05:00
Jessie Frazelle
dc37358d8c Merge pull request #10619 from bcicen/add-logpath-to-inspect-container 
Add logpath to inspect container
 2015-02-19 12:56:45 -08:00
Ahmet Alp Balkan
27a73a98b7 Shorten help messages for docker cmd flags 
In order to fit printed messages to fit 80 chars,
rewording messages for `-H` and `--tls` flags.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-02-18 22:52:33 -08:00
Bradley Cicenas
06c01b02f5 add logpath to docker inspect. 
Signed-off-by: Bradley Cicenas <bradley.cicenas@gmail.com>
 2015-02-18 10:19:52 -05:00
Jessie Frazelle
9054e4dca3 Merge pull request #10779 from duglin/10771-FixStatsHelp 
Fix 'docker stats' help message
 2015-02-16 11:18:58 -08:00
Colm Hally
5dfef4fe08 Group published and exposed ports by contiguous ranges 
Signed-off-by: Colm Hally <colmhally@gmail.com>
 2015-02-16 10:52:23 -08:00
Michael Crosby
9ea20f260c Merge pull request #10571 from jfrazelle/8689-remove-all-aliases 
Removes the feature to pull all image aliases.
 2015-02-16 10:29:20 -08:00
Doug Davis
effa5e2c18 Use newer help out for 'docker' and 'docker run' 
Closes #10828

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-02-16 08:46:07 -08:00
Doug Davis
b55346b327 Fix 'docker stats' help message 
Closes #10771

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-02-13 12:45:50 -08:00
Arnaud Porterie
7a7c00ca08 Update docs for HTTP_PROXY 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-02-12 11:40:56 -08:00
André Martins
0ce42dcc96 Fixes #10457-Pause-and-unpause-accept-multi-containers 
Applied multi parameters to pause and unpause.
Created a new test file dedicated for pause commands.
Created a new utility function to get a slice of paused containers.
Updated documentation

Signed-off-by: André Martins <martins@noironetworks.com>
 2015-02-07 00:28:49 +00:00
Jessie Frazelle
e706be77a4 Merge pull request #10546 from SvenDowideit/update-boolean-flags-help 
Documentation on boolean flags is wrong #10517
 2015-02-06 15:12:11 -08:00
Alexander Morozov
0f8f04a774 Fix example about ps and linked containers 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-02-06 14:05:08 -08:00
Sven Dowideit
1e6e68361c Documentation on boolean flags is wrong #10517 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-06 19:52:01 +10:00
Fred Lifton
68b0ed54cb Merge pull request #10574 from SvenDowideit/docker-stats-limited-to-libcontainer 
For now, docker stats appears to be libcontainer only
 2015-02-05 17:52:36 -08:00
Sven Dowideit
fcb975cfd1 Fix a small spelling error in the dm.blkdiscard docs 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-05 10:57:33 +10:00
Sven Dowideit
1cc774b4fa Merge pull request #10508 from SvenDowideit/ctrl-backslash-used-to-generate-a-stacktrace 
Remove docker attach generates a stacktrace on ctrl-\ docs, as i can't trigger it
 2015-02-05 10:21:00 +10:00
Sven Dowideit
2507e0b64f For now, docker stats appears to be libcontainer only 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-05 10:12:05 +10:00
Jessica Frazelle
72a9000fcf Removes the feature to pull all image aliases. 
It didn't work on v2 anyways. And an image with a lot of aliases was slow to
fetch.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
 2015-02-04 15:06:34 -08:00
Jessie Frazelle
a271eaeba2 Merge pull request #10547 from duglin/Issue10214 
Pretty the help text
 2015-02-04 11:31:18 -08:00
Doug Davis
2203b37733 Pretty the help text 
This modifies the "docker help" text so that it is no wider than 80 chars
and each description fits on one line. This will also try to use ~ when
possible

Added a test to make sure we don't go over 80 chars again.
Added a test to make sure we use ~

Applied rules/tests to all docker commands - not just main help text

Closes #10214

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-02-04 07:59:16 -08:00
Sven Dowideit
ea6db8af18 Spelling mistake in dockerlinks 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-04 12:12:46 +10:00
Sven Dowideit
e58fdaae05 Docker attach documentation didn't make sense to me 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-03 11:53:14 +10:00
Chen Hanxiao
d619b5594b docs: change events --since to fit RFC3339Nano 
PR6931 changed time format to RFC3339Nano.
But the example in cli.md does not changed.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 2015-02-02 22:39:03 +08:00
Michael Crosby
edaf23b7a7 Merge pull request #10145 from duglin/Issue10141 
Docker run -e FOO should erase FOO if FOO isn't set in client env
 2015-01-21 14:16:51 -08:00
Michael Crosby
db9b1e3654 Update to docker stats documentation 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-01-21 11:44:23 -08:00
Michael Crosby
76141a0077 Add documentation for stats feature 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-01-20 20:21:47 -08:00