centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-30 07:48:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
20,092 Commits 54 Branches 28 Tags
692bfdaee3b48f4e5174bb80098692a0ded1aecf
Commit Graph

2355 Commits

Author SHA1 Message Date
David Calavera
4389fc8bf9 Merge pull request #13425 from runcom/13421-stats-default-stream 
Fix regression in stats API endpoint
 2015-05-29 15:05:21 -07:00
Jessica Frazelle
185f392691 fix bug with rmi multiple tag 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-29 14:04:06 -07:00
Antonio Murdaca
ec97f41465 Fix regression in stats API endpoint where stream query param default is true 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-29 22:38:36 +02:00
Antonio Murdaca
15134a3320 Remove PortSpecs from Config 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-05-29 22:38:09 +02:00
David Calavera
4c9fd72a91 Merge pull request #13598 from calavera/fix_windows_build 
Do not require cgroups capabilities on windows to run the integration tests.
 2015-05-29 12:57:40 -07:00
David Calavera
a914101296 Do not require cgroups capabilities on windows to run the integration tests. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-29 11:42:40 -07:00
Jessica Frazelle
b372f9f224 fix experimental version and release script 
add api version experimental

Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-29 10:00:22 -07:00
Jessica Frazelle
1392f99a97 skip test on lxc 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-28 14:54:12 -07:00
Eric Windisch
e58161fedc Expand unshare test to include privileged test 
This ensures that AppArmor, not other mechanisms used
by Docker or the kernel is restricting the mount.

Signed-off-by: Eric Windisch <eric@windisch.us>
 2015-05-28 16:49:48 -04:00
David Calavera
617a0c2fde Merge pull request #13428 from duglin/niceHelp2 
Nice help2
 2015-05-28 11:09:02 -07:00
Jessie Frazelle
5bb6262d88 Merge pull request #13529 from hqhq/hq_skip_cgroup_test 
Skip test if not have Cpu quota or Cpu period
 2015-05-28 10:57:32 -07:00
Qiang Huang
34e5b6af19 Skip test if not have Cpu quota or Cpu period 
Closes: #13522

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-28 14:59:58 +08:00
Dan Walsh
35a7f0c59e Merge branch 'master' of github.com:docker/docker into kill 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-05-27 16:37:32 -04:00
David Calavera
26650e2ccc Merge pull request #13483 from jfrazelle/lxc-we-meet-again 
fix lxc tests unshare, they dont use our apparmor profile
 2015-05-27 10:22:31 -07:00
Alexander Morozov
2029257e3c Merge pull request #13493 from jlhawn/volume_unmount_fix 
Fix container unmount networkMounts
 2015-05-27 08:44:11 -07:00
Phil Estes
f3e56420a3 Merge pull request #13499 from cpuguy83/fix_stats_unsubscribe 
Fix unregister stats on when rm running container
 2015-05-27 11:10:36 -04:00
Dan Walsh
66121d1b45 Merge branch 'master' of github.com:docker/docker into kill 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-05-27 11:00:12 -04:00
Antonio Murdaca
3f66f6f2f0 Merge pull request #13500 from HuKeping/cleanup 
Remove unused code
 2015-05-27 13:59:40 +02:00
Hu Keping
a34cb32186 Remove unused code 
As far as I see, it's a dead code.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-05-27 22:39:02 +08:00
Lei Jitang
13f2aa7068 Add --net=container with --publish --publish-all --expose error out 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-27 15:31:06 +08:00
Brian Goff
b3e8ab3021 Fix unregister stats on when rm running container 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-26 22:22:03 -04:00
Lei Jitang
bdb77078b5 Ensure all the running containers are killed on daemon shutdown 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-27 09:09:25 +08:00
Josh Hawn
04f99a6ca8 Fix container unmount networkMounts 
UnmountVolumes used to also unmount 'specialMounts' but it no longer does after
a recent refactor of volumes. This patch corrects this behavior to include
unmounting of `networkMounts` which replaces `specialMounts` (now dead code).

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2015-05-26 17:38:26 -07:00
Arnaud Porterie
b50e780925 Merge pull request #13491 from jfrazelle/revert-exec-privileged 
Revert "Add docker exec run a command in privileged mode"
 2015-05-26 16:41:50 -07:00
Tibor Vass
54b514735c Merge pull request #12881 from nakedible/patch-1 
Prevent fallback to v1 registry for digest pulls
 2015-05-26 19:24:37 -04:00
Alexander Morozov
de318d8c1d Merge pull request #13489 from cpuguy83/cleanup_rm_funcs 
Cleanup container rm funcs
 2015-05-26 14:24:02 -07:00
Jessica Frazelle
40b71adee3 Revert "Add docker exec run a command in privileged mode" 
This reverts commit 72a500e9e5.

Signed-off-by: Jessica Frazelle <princess@docker.com>

Conflicts:
	daemon/execdriver/native/exec.go
	integration-cli/docker_cli_exec_test.go
	runconfig/exec.go
 2015-05-26 14:12:16 -07:00
Arnaud Porterie
47e727d1fc Merge pull request #13440 from LK4D4/fix_bridge_none 
Fix network with -b none
 2015-05-26 14:08:21 -07:00
Brian Goff
f8628ba891 Cleanup container rm funcs 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-26 15:38:52 -04:00
Jessica Frazelle
a08fb73f93 fix lxc tests unshare, they dont use our apparmor profile 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-26 10:31:21 -07:00
Sebastiaan van Stijn
aee9ac302d Merge pull request #13335 from jfrazelle/add-apparmor-unshare-test 
add unshare apparmor profile test
 2015-05-26 17:32:45 +02:00
Zhang Wei
ab121345ee Cleanup: change test func name 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-05-25 14:51:10 +08:00
Alexander Morozov
3cb14df68c Fix network with -b none 
* Don't AllocateNetwork when network is disabled
* Don't createNetwork in execdriver when network is disabled

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-24 08:26:59 -07:00
Arnaud Porterie
bce3e761c0 Merge pull request #13161 from calavera/plugin_discovery 
Proposal: Volume refactor and external volume plugins
 2015-05-23 18:44:18 -07:00
Doug Davis
8324d7918b Carry #11858 
Continues 11858 by:
- Making sure the exit code is always zero when we ask for help
- Making sure the exit code isn't zero when we print help on error cases
- Making sure both short and long usage go to the same stream (stdout vs stderr)
- Making sure all docker commands support --help
- Test that all cmds send --help to stdout, exit code 0, show full usage, no blank lines at end
- Test that all cmds (that support it) show short usage on bad arg to stderr, no blank line at end
- Test that all cmds complain about a bad option, no blank line at end
- Test that docker (w/o subcmd) does the same stuff mentioned above properly

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-23 09:14:18 -07:00
Alexander Morozov
89582f9781 Merge pull request #13403 from hqhq/hq_fix_ipcmode_check 
Don't check running container at create time
 2015-05-23 08:32:51 -07:00
David Calavera
d592778f4a Propagate unmount events to the external volume drivers. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-22 16:43:34 -07:00
Qiang Huang
84aae5a226 Don't check running container at create time 
We should let user create container even if the container he wants
join is not running, that check should be done at start time.

In this case, the running check is done by getIpcContainer() when
we start container.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-23 07:15:14 +08:00
Jessica Frazelle
a1ea562b20 lol 108 chars ETOOMANY 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-22 10:10:17 -07:00
Zhang Wei
6809fa6861 Delete "defer deleteAllContainers()" from integration-cli 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-05-22 17:01:52 +08:00
Arnaud Porterie
4fc37a1ede Mark --volume-driver as experimental 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-21 20:34:17 -07:00
David Calavera
81fa9feb0c Volumes refactor and external plugin implementation. 
Signed by all authors:

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Jeff Lindsay <progrium@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Signed-off-by: Luke Marsden <luke@clusterhq.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-05-21 20:34:17 -07:00
Jessie Frazelle
2b8271399e Merge pull request #13386 from icecrime/experimental_suffix_version 
Suffix experimental version / fix warning output
 2015-05-21 17:42:23 -07:00
Qiang Huang
c0dd8538db Fix test failure when --net none build 
Closes: #13369

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-22 08:21:09 +08:00
Arnaud Porterie
78578125ce Add suffix to experimental builds version 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-21 16:27:42 -07:00
Alexander Morozov
7fffcfff32 Merge pull request #13387 from cpuguy83/fix_ngroutine_test 
Better checking for LogsFollowGoroutinesWithStdout
 2015-05-21 12:31:57 -07:00
Brian Goff
2805ff1ece Better checking for LogsFollowGoroutinesWithStdout 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-05-21 14:13:01 -04:00
Doug Davis
012e588a74 Add a 'docker create' + 'docker rm' testcase 
Per @thaJeztah's comment here: https://github.com/docker/docker/pull/13367#issuecomment-104286651
I couldn't find an existing test that covered this.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-21 07:30:51 -07:00
Lei Jitang
d0de2b1e2f Make docker ps --size show virtual size really work 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-05-21 08:57:11 +08:00
Antonio Murdaca
0fddb6ad7e Merge pull request #13263 from rajdeepd/dry-run-test-2 
TestCase for CpuShares and Cpuset
 2015-05-20 23:33:42 +02:00