61e7efeadd
Merge pull request #11364 from Mashimiao/update-manpage
...
Update docker manpage
2015-03-16 14:13:27 -07:00
bc7d1d6ef3
Merge pull request #10298 from hqhq/hq_move_resource_to_hostconfig
...
move resource options from Config to hostConfig
2015-03-15 17:30:46 -07:00
2830b6fa58
Merge pull request #11297 from moxiegirl/11235-tweak-doc
...
Consistency in the restart policy docs
2015-03-14 19:58:46 -07:00
02c1dd899a
Merge pull request #10238 from miminar/ephemeral-port-range-allocation
...
Use system's ephemeral port range for port allocation
2015-03-13 15:18:05 -07:00
fa1fa50160
Update docker manpage
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-03-13 15:28:09 +08:00
cc4095a18c
Merge pull request #11280 from MabinGo/docs_api-enable-cors_deprecated
...
docs: --api-enable-cors is deprecated,updated docs description
2015-03-11 15:28:28 -07:00
1b46248a33
Minor tweak to build -f text to make it clear Dockerfile is in context
...
Closes #11289
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-11 09:04:30 -07:00
0648e59ad8
docs: api-enable-cors is deprecated,updated docs description
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-03-11 11:38:37 +08:00
837eec064d
move resources from Config to HostConfig
...
Cgroup resources are host dependent, they should be in hostConfig.
For backward compatibility, we just copy it to hostConfig, and leave it in
Config for now, so there is no regressions, but the right way to use this
throught json is to put it in HostConfig, like:
{
"Hostname": "",
...
"HostConfig": {
"CpuShares": 512,
"Memory": 314572800,
...
}
}
As we will add CpusetMems, CpusetCpus is definitely a better name, but some
users are already using Cpuset in their http APIs, we also make it compatible.
The main idea is keep using Cpuset in Config Struct, and make it has the same
value as CpusetCpus, but not always, some scenarios:
- Users use --cpuset in docker command, it can setup cpuset.cpus and can
get Cpuset field from docker inspect or other http API which will get
config info.
- Users use --cpuset-cpus in docker command, ditto.
- Users use Cpuset field in their http APIs, ditto.
- Users use CpusetCpus field in their http APIs, they won't get Cpuset field
in Config info, because by then, they should already know what happens
to Cpuset.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-03-11 09:31:18 +08:00
10c01fce45
Consistency in the restart policy docs
...
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
2015-03-10 15:13:34 -07:00
7e47bb6eff
Merge pull request #11235 from coolljt0725/fix_default_restart_name
...
Set default restart policy name to `no` Closes #10874
2015-03-10 12:12:40 -07:00
311a600f19
Set default restart policy name to 'no' Closes #10874
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-10 10:09:12 +08:00
b85c137f1d
Merge pull request #11227 from coolljt0725/fix_start_help_message
...
Fix docker start help message
2015-03-09 09:54:36 -07:00
8b516bf5ce
Merge pull request #11177 from duglin/10805-cp-to-stdot
...
Add support for 'docker cp' to write to stdout
2015-03-09 09:51:48 -07:00
08211aab57
Merge pull request #11146 from SvenDowideit/takeover-11126
...
fix to cpu.shares documentation by @hqhq
2015-03-09 09:48:33 -07:00
0eb3544c43
Use system's ephemeral port range for port allocation
...
Read `/proc/sys/net/ipv4/ip_local_port_range` kernel parameter to obtain
ephemeral port range that now sets the boundaries of port allocator
which finds free host ports for those exported by containers.
Signed-off-by: Michal Minar <miminar@redhat.com>
2015-03-09 09:13:20 +01:00
3c37f88aff
Fix docker start help message
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-07 20:45:46 +08:00
55fc7f5c9d
Merge pull request #11204 from duglin/VolumeDocs
...
Tell users about how VOLUME initializes the new mount point/volume
2015-03-06 10:44:03 -08:00
9be2ca2394
Tell users about how VOLUME initializes the new mount point/volume
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-06 10:25:47 -08:00
f3d96e81e9
Add support for 'docker cp' to write to stdout
...
Closes #10805
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-05 15:22:08 -08:00
e4a90897e1
Merge pull request #11151 from chenhanxiao/See-also-export-import-save-load
...
docs: add See Also for description of export/import and save/load
2015-03-05 10:35:37 -08:00
cbb149f52f
docs: add See Also for description of export/import and save/load
...
make them reference to each other.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-03-04 20:21:38 -05:00
26e5a9d76a
fix to cpu.shares documentation by @hqhq
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-03-04 13:13:22 -08:00
e8dc07dabc
docs: fix cpu.shares part in man pages
...
The original description has some mistakes and lack of many useful
information, I rewrite them to make it accurate and complete.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-03-04 13:01:30 -08:00
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
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
41dc0e08d3
docs: add See Also for description of login/logout and start/stop
...
make them reference to each other.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-03-01 01:36:00 -05:00
f8dbcdc599
Merge pull request #10940 from 1HLtd/master
...
docs/man/docker.1.md: spelling mistake fix
2015-02-25 20:45:46 -05:00
9a2e58dd29
Merge pull request #10498 from ashahab-altiscale/9875-lxc-stats
...
Implements stats for lxc driver
2015-02-25 13:46:18 -08:00
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
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
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
811132f4b9
docs/man/docker.1.md: spelling mistake fix
...
Signed-off-by: Marian Marinov <mm@yuhu.biz>
2015-02-22 22:47:22 +02:00
573e2484a5
Merge pull request #10898 from noironetworks/Fixing-docs-for-docker-ps-filter
...
Added missing documentation for PR #8543
2015-02-19 17:19:09 -08:00
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
401e93bbb9
Added missing documentation for PR #8543
...
Added more examples and functionalities for docker ps documentation
Signed-off-by: André Martins <martins@noironetworks.com>
2015-02-19 22:05:14 +00:00
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
c1deb7f524
man page description for -c/--cpu-shares flag for docker run command
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-02-18 14:01:55 -05:00
06c01b02f5
add logpath to docker inspect.
...
Signed-off-by: Bradley Cicenas <bradley.cicenas@gmail.com>
2015-02-18 10:19:52 -05:00
6c4e1387d1
Merge pull request #10846 from chenhanxiao/pause-unpause-link
...
docs: add See also for description of pause and unpause
2015-02-17 19:26:56 -05:00
a69b189fc5
docs: add See Also for description of pause and unpause
...
make them reference to each other.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-02-17 10:22:28 +08:00
9054e4dca3
Merge pull request #10779 from duglin/10771-FixStatsHelp
...
Fix 'docker stats' help message
2015-02-16 11:18:58 -08:00
bfba622f86
docs: fix a typo in Dockerfile.5.md
...
s/Exececutable/Executable
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-02-15 11:06:18 +08:00
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
14131b65c4
Cleans up docs/man/Dockerfile.5.md
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-02-13 12:47:58 -05:00
c4340de04f
docs: fix a typo in Dockerfile.5.md
...
s/Mutliple/Multiple
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-02-07 17:09:20 +08:00
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
e4a49ae188
Merge pull request #10424 from LK4D4/fix_non_tailed_log_format
...
Fix logs, so now, old and followed logs has same format without []
2015-02-06 14:35:45 -08:00
d1f18786ac
Merge pull request #10263 from hqhq/hq_check_memoryswap
...
add check for memoryswap
2015-02-06 13:43:23 -08:00
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
Jessie Frazelle
Arnaud Porterie
moxiegirl
Alexander Morozov
Ma Shimiao
Doug Davis
Mabin
Qiang Huang
Mary Anthony
Lei Jitang
Michal Minar
Fred Lifton
Chen Hanxiao
Sven Dowideit
resouer
James Turnbull
Michael Crosby
Dan Walsh
Abin Shahab
Marian Marinov
André Martins
Shishir Mahajan
Bradley Cicenas
Brian Goff