docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
13,730 Commits 12 Branches 296 Tags
7e91e1c6c8d193fc2b20249461f202b78b88a4a3
Commit Graph

185 Commits

Author SHA1 Message Date
Arnaud Porterie
ed5523443d Merge pull request #10298 from hqhq/hq_move_resource_to_hostconfig 
move resource options from Config to hostConfig
Upstream-commit: bc7d1d6ef307b05b0951f5c884620a87c5ac8f7d
Component: engine
 2015-03-15 17:30:46 -07:00
moxiegirl
a7edb719ca Merge pull request #11297 from moxiegirl/11235-tweak-doc 
Consistency in the restart policy docs
Upstream-commit: 2830b6fa584216b9e6aabe71d57bf04b8879a485
Component: engine
 2015-03-14 19:58:46 -07:00
Alexander Morozov
1174b9d420 Merge pull request #10238 from miminar/ephemeral-port-range-allocation 
Use system's ephemeral port range for port allocation
Upstream-commit: 02c1dd899a7ea84c89cb6f5a87297f4690e393ef
Component: engine
 2015-03-13 15:18:05 -07:00
moxiegirl
e0e2bdc16b Merge pull request #11280 from MabinGo/docs_api-enable-cors_deprecated 
docs: --api-enable-cors is deprecated,updated docs description
Upstream-commit: cc4095a18cfff27dfca77251978b6a9bdaa5c86a
Component: engine
 2015-03-11 15:28:28 -07:00
Doug Davis
45e612ea59 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>
Upstream-commit: 1b46248a332dab1a886d9c4352f9e0057e6c284f
Component: engine
 2015-03-11 09:04:30 -07:00
Mabin
28a7abbf0e docs: api-enable-cors is deprecated,updated docs description 
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: 0648e59ad85e676f8e0a02156ea5e79a6e106267
Component: engine
 2015-03-11 11:38:37 +08:00
Qiang Huang
71f67ca560 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>
Upstream-commit: 837eec064d2d40a4d86acbc6f47fada8263e0d4c
Component: engine
 2015-03-11 09:31:18 +08:00
Mary Anthony
7833f51797 Consistency in the restart policy docs 
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: 10c01fce45b27959db8d8131271f5ce27c1b4221
Component: engine
 2015-03-10 15:13:34 -07:00
Jessie Frazelle
993f8d5799 Merge pull request #11235 from coolljt0725/fix_default_restart_name 
Set default restart policy name to `no` Closes #10874
Upstream-commit: 7e47bb6effd1f076a78827543c4b4ce399c0ad1b
Component: engine
 2015-03-10 12:12:40 -07:00
Lei Jitang
0199092cfa Set default restart policy name to 'no' Closes #10874 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 311a600f1912c0d2a30becffdecde6026ada2624
Component: engine
 2015-03-10 10:09:12 +08:00
moxiegirl
e209023d26 Merge pull request #11227 from coolljt0725/fix_start_help_message 
Fix docker start help message
Upstream-commit: b85c137f1d8c7d803653cab43c886a3c5d7e3f02
Component: engine
 2015-03-09 09:54:36 -07:00
moxiegirl
943c9020e9 Merge pull request #11177 from duglin/10805-cp-to-stdot 
Add support for 'docker cp' to write to stdout
Upstream-commit: 8b516bf5ce85641095378ed8900aa63f0f32a619
Component: engine
 2015-03-09 09:51:48 -07:00
moxiegirl
a3b4760c40 Merge pull request #11146 from SvenDowideit/takeover-11126 
fix to cpu.shares documentation by @hqhq
Upstream-commit: 08211aab57cf6891a845d8e7a7020e203ae2812d
Component: engine
 2015-03-09 09:48:33 -07:00
Michal Minar
054ec22a23 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>
Upstream-commit: 0eb3544c43cb8e9488d6bf329ceecc11fa0db6f1
Component: engine
 2015-03-09 09:13:20 +01:00
Lei Jitang
143601c86b Fix docker start help message 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3c37f88aff42c1d900d18d1a8c81fc857e650d44
Component: engine
 2015-03-07 20:45:46 +08:00
moxiegirl
405e3e2f5f Merge pull request #11204 from duglin/VolumeDocs 
Tell users about how VOLUME initializes the new mount point/volume
Upstream-commit: 55fc7f5c9d3bb0e03e76b62c2ff0123a20d5e3c7
Component: engine
 2015-03-06 10:44:03 -08:00
Doug Davis
ed2fc0acb0 Tell users about how VOLUME initializes the new mount point/volume 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 9be2ca2394112d8e988dc492f482cefd93a5b5fb
Component: engine
 2015-03-06 10:25:47 -08:00
Doug Davis
312da52079 Add support for 'docker cp' to write to stdout 
Closes #10805

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: f3d96e81e9c2a738ec577b814092f8953932de3a
Component: engine
 2015-03-05 15:22:08 -08:00
Fred Lifton
7f2c00ba17 Merge pull request #11151 from chenhanxiao/See-also-export-import-save-load 
docs: add See Also for description of export/import and save/load
Upstream-commit: e4a90897e129627529a0ce946b8b3f98ec7e72b6
Component: engine
 2015-03-05 10:35:37 -08:00
Chen Hanxiao
caf81c4e3f 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>
Upstream-commit: cbb149f52f5624cec41498398ab48c4043678707
Component: engine
 2015-03-04 20:21:38 -05:00
Sven Dowideit
e3a22924ff fix to cpu.shares documentation by @hqhq 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 26e5a9d76a802662bf287ce9de1f98988749636a
Component: engine
 2015-03-04 13:13:22 -08:00
Qiang Huang
de394b4b9f 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>
Upstream-commit: e8dc07dabc962e02876cadfe5f7b508a2453bec1
Component: engine
 2015-03-04 13:01:30 -08:00
Jessie Frazelle
97033cc69f Merge pull request #10586 from resouer/10532-fix-cors-hardcode 
Fix 10532 to change --api-enable-cors to string.
Upstream-commit: 7b3ffd5cc0b293aac67e2c07948b2e68525b72d1
Component: engine
 2015-03-04 18:42:20 +00:00
resouer
f947fbc4ae 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>
Upstream-commit: f3dd2db4ff7de1399a49af928cd3eae4fccf8764
Component: engine
 2015-03-03 11:21:19 +08:00
Chen Hanxiao
d411e5860d 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>
Upstream-commit: 41dc0e08d3f77b334670cc2ff3fb1a0c16fd9300
Component: engine
 2015-03-01 01:36:00 -05:00
James Turnbull
0c7bf5829a Merge pull request #10940 from 1HLtd/master 
docs/man/docker.1.md: spelling mistake fix
Upstream-commit: f8dbcdc5994a300308f4d259c62b58974a25e028
Component: engine
 2015-02-25 20:45:46 -05:00
Michael Crosby
47a091cc6c Merge pull request #10498 from ashahab-altiscale/9875-lxc-stats 
Implements stats for lxc driver
Upstream-commit: 9a2e58dd2940d11d3c8f22a0fabe54591a5e3619
Component: engine
 2015-02-25 13:46:18 -08:00
Dan Walsh
4e766f5eaa pass --change changes to the import job 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 17abfc3ddc79592753289a8556a343e276fb15b5
Component: engine
 2015-02-24 13:01:36 -05:00
Dan Walsh
2bc83bf87b 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)
Upstream-commit: 5767548fa79342cee94dbb66b9c41671d4a1879f
Component: engine
 2015-02-24 13:01:36 -05:00
Abin Shahab
848426a114 Implements stats for lxc driver 
Implements stats and fixes stats test.

Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Upstream-commit: 1a26ed09ee6199341297f5e5ef8c5ed30efb6596
Component: engine
 2015-02-23 10:16:52 +00:00
Marian Marinov
0e698514b4 docs/man/docker.1.md: spelling mistake fix 
Signed-off-by: Marian Marinov <mm@yuhu.biz>
Upstream-commit: 811132f4b95817b26d28c5e182d3f6f6d62f45bf
Component: engine
 2015-02-22 22:47:22 +02:00
Jessie Frazelle
299b14d7b4 Merge pull request #10898 from noironetworks/Fixing-docs-for-docker-ps-filter 
Added missing documentation for PR #8543
Upstream-commit: 573e2484a5017385d645a11de29f9c9e7e207c5b
Component: engine
 2015-02-19 17:19:09 -08:00
Jessie Frazelle
d5362cffa1 Merge pull request #10468 from noironetworks/10457-Pause-and-unpause-accept-multi-containers 
Allow docker pause and unpause to accept multiple containers
Upstream-commit: 934535db9c78b20481c8ccabdf174926c6e04d4d
Component: engine
 2015-02-19 15:16:05 -08:00
André Martins
caf4b888be Added missing documentation for PR #8543 
Added more examples and functionalities for docker ps documentation

Signed-off-by: André Martins <martins@noironetworks.com>
Upstream-commit: 401e93bbb9b4bd682234f0ebca59aa83bfbe3f2e
Component: engine
 2015-02-19 22:05:14 +00:00
Jessie Frazelle
7eeecba437 Merge pull request #10619 from bcicen/add-logpath-to-inspect-container 
Add logpath to inspect container
Upstream-commit: dc37358d8c9b177a050620731cf3b7f247a26f78
Component: engine
 2015-02-19 12:56:45 -08:00
Shishir Mahajan
77b12b70c8 man page description for -c/--cpu-shares flag for docker run command 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: c1deb7f524da94adc0f7dd3ddf4607bbb92b8d02
Component: engine
 2015-02-18 14:01:55 -05:00
Bradley Cicenas
cc3ec80739 add logpath to docker inspect. 
Signed-off-by: Bradley Cicenas <bradley.cicenas@gmail.com>
Upstream-commit: 06c01b02f5d8149407028324e751df5c0a92fd14
Component: engine
 2015-02-18 10:19:52 -05:00
James Turnbull
9067686a86 Merge pull request #10846 from chenhanxiao/pause-unpause-link 
docs: add See also for description of pause and unpause
Upstream-commit: 6c4e1387d143f8f78738b9e54e7ea761588e3a62
Component: engine
 2015-02-17 19:26:56 -05:00
Chen Hanxiao
ee82c91c8a 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>
Upstream-commit: a69b189fc5796248bedc01a9feb34da765c73547
Component: engine
 2015-02-17 10:22:28 +08:00
Jessie Frazelle
bc6bb1e0e5 Merge pull request #10779 from duglin/10771-FixStatsHelp 
Fix 'docker stats' help message
Upstream-commit: 9054e4dca3320ec769a02aed8c19aac577688992
Component: engine
 2015-02-16 11:18:58 -08:00
Chen Hanxiao
564ab376d9 docs: fix a typo in Dockerfile.5.md 
s/Exececutable/Executable

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: bfba622f86eb45e25d4ff6dc6808cd740bd2a671
Component: engine
 2015-02-15 11:06:18 +08:00
Doug Davis
79ea7dd989 Fix 'docker stats' help message 
Closes #10771

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b55346b3279a3243da8cab82a7ddc427454aba61
Component: engine
 2015-02-13 12:45:50 -08:00
Brian Goff
b108618571 Cleans up docs/man/Dockerfile.5.md 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 14131b65c41ee9f562c3311e533e0f7d9c9de97b
Component: engine
 2015-02-13 12:47:58 -05:00
Chen Hanxiao
2fcf439ff5 docs: fix a typo in Dockerfile.5.md 
s/Mutliple/Multiple

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: c4340de04faec1b9d54da62a8a2174da4d6a301b
Component: engine
 2015-02-07 17:09:20 +08:00
André Martins
19b7fc9336 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>
Upstream-commit: 0ce42dcc96d0f3bbfb89b23eb3c255d2ddaa9624
Component: engine
 2015-02-07 00:28:49 +00:00
Michael Crosby
440786c4fd Merge pull request #10424 from LK4D4/fix_non_tailed_log_format 
Fix logs, so now, old and followed logs has same format without []
Upstream-commit: e4a49ae1885a7f80e713d1d1fc852f6e4214dfe6
Component: engine
 2015-02-06 14:35:45 -08:00
Michael Crosby
24564a4544 Merge pull request #10263 from hqhq/hq_check_memoryswap 
add check for memoryswap
Upstream-commit: d1f18786ac009fedb716373ebc2ea6d646d3d8f2
Component: engine
 2015-02-06 13:43:23 -08:00
Fred Lifton
8eee87ed67 Merge pull request #10574 from SvenDowideit/docker-stats-limited-to-libcontainer 
For now, docker stats appears to be libcontainer only
Upstream-commit: 68b0ed54cb7ed9e4b66e8a9e0708577b32088de2
Component: engine
 2015-02-05 17:52:36 -08:00
Qiang Huang
a56a6166e9 update docs for memory and memoryswap 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 0c0f0d5ab41cae62a441502f26c1c300fc61e25d
Component: engine
 2015-02-05 09:12:56 +08:00
Sven Dowideit
a31c4ae7c4 Fix a small spelling error in the dm.blkdiscard docs 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: fcb975cfd17cfbe45b7f6661c2c1c4a94de04c94
Component: engine
 2015-02-05 10:57:33 +10:00