fc2f90fc63
Merge pull request #14741 from HuKeping/ci-refactor
...
CI: use dockercmd when possible
2015-07-20 09:49:40 -07:00
27ac154d05
CI: use dockercmd when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-07-21 04:40:15 +08:00
ee7af0d2cb
Merge pull request #14671 from hqhq/hq_use_dockerCmd
...
Use dockerCmd when possible
2015-07-20 09:44:42 -07:00
77bbee3d00
Merge pull request #14716 from LK4D4/update_libcontainer
...
Update libcontainer to v0.0.2
2015-07-20 11:33:19 -04:00
c6a3517246
Merge pull request #14724 from coolljt0725/14603-dockerCmd-integration-cli-3
...
Refactor: use dockerCmd when possible in integraiton-cli tests
2015-07-20 16:00:38 +02:00
46d7762f26
Merge pull request #14614 from hqhq/hq_simplify_swappiness
...
Simplify swappiness check
2015-07-20 13:51:39 +02:00
6f8ddec1d0
Simplify swappiness check
...
As suggested in https://github.com/docker/docker/pull/14004/files#r34022527
The concern there is we can't differentiate whether user explicitly
asked for an invalid value of -1 or he did not specify anything.
I don't think this would be a problem, because:
- like all other default values like zero, we can't differentiate
user specify it or not, most of which, zeros are also invalid, so
default is default, we show these default values in help info,
so users would know if they set value as default, it'll be like
they set nothing.
- we can't do this kind of string check in REST api request, so
it'll make the behave different from docker command and RESTapi.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-20 16:10:10 +08:00
668e2369cc
dockerCmd when possible
...
Addresses: #14603
integration-cli/docker_cli_daemon_experimental_test.go (hqhq)
integration-cli/docker_cli_daemon_test.go (hqhq)
integration-cli/docker_cli_diff_test.go (hqhq)
integration-cli/docker_cli_events_test.go (hqhq)
integration-cli/docker_cli_events_unix_test.go (hqhq)
integration-cli/docker_cli_exec_test.go (hqhq)
integration-cli/docker_cli_exec_unix_test.go (hqhq)
integration-cli/docker_cli_experimental_test.go (hqhq)
integration-cli/docker_cli_export_import_test.go (hqhq)
integration-cli/docker_cli_help_test.go (hqhq)
integration-cli/docker_cli_history_test.go (hqhq)
integration-cli/docker_cli_images_test.go (hqhq)
integration-cli/docker_cli_import_test.go (hqhq)
integration-cli/docker_cli_info_test.go (hqhq)
integration-cli/docker_cli_inspect_test.go (hqhq)
integration-cli/docker_cli_kill_test.go (hqhq)
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-20 14:55:40 +08:00
eef6eda7d2
Recfactor: Use dockerCmd when possible in integration-cli tests
...
Part of #14603
integration-cli/docker_cli_links_test.go (coolljt0725)
integration-cli/docker_cli_links_unix_test.go (coolljt0725)
integration-cli/docker_cli_logs_test.go (coolljt0725)
integration-cli/docker_cli_nat_test.go (coolljt0725)
integration-cli/docker_cli_network_test.go (coolljt0725)
integration-cli/docker_cli_stats_test.go (coolljt0725)
integration-cli/docker_cli_tag_test.go (coolljt0725)
integration-cli/docker_cli_top_test.go (coolljt0725)
integration-cli/docker_cli_version_test.go (coolljt0725)
integration-cli/docker_cli_wait_test.go (coolljt0725
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-07-20 14:44:22 +08:00
008d57bf7f
Merge pull request #14747 from moxiegirl/update-docs-dockerfile
...
Updating to use the new base
2015-07-20 12:00:02 +10:00
e0bceb7064
Updating to use the new base
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-19 15:39:43 -07:00
ccc78c9968
Merge pull request #14715 from icecrime/14365_remove_rhel6_from_docs
...
Update RHEL/Centos/Fedora installation docs
2015-07-19 13:00:50 -07:00
32764fe3b9
Merge pull request #14676 from duglin/Issue14675
...
Add missing 'Names' field to /containers/json API output
2015-07-19 06:53:25 -07:00
a89370039a
Merge pull request #14667 from charleswhchan/patch-5
...
Trim excess from image. Based on the context, the email itself is sufficient.
2015-07-18 11:14:28 +02:00
c6cde91b7d
Add dockerCmdWithStdoutStderr function
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-07-18 10:48:28 +08:00
a0a0b8499e
Merge pull request #14722 from duglin/FixInspectExecIDTest
...
Move inspect into the loop on InspectExecID test
2015-07-17 18:21:49 -07:00
f06620ece3
Move inspect into the loop on InspectExecID test
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-17 17:30:24 -07:00
7f353a11e4
Merge pull request #13681 from tiborvass/carry-11784
...
Carry 11784: rmi dangling is unsafe when pulling
2015-07-17 16:17:18 -07:00
f0f261a899
Update libcontainer to v0.0.2
...
This is fix for proper setup of nested containers cgroups.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-17 15:05:17 -07:00
465192cb28
Merge pull request #14706 from duglin/FixInspectTest
...
Fix InspectExecID test
2015-07-17 14:37:23 -07:00
340bd135dd
Update RHEL/Centos/Fedora installation docs
...
Remove mentions of older systems.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-07-17 14:04:19 -07:00
415f744d0c
Merge pull request #11485 from wlan0/rollover_log
...
Add rollover log driver, and --log-driver-opts flag
2015-07-17 22:41:26 +02:00
a192105d3b
Merge pull request #14413 from vbatts/vbatts-graph-cleanup
...
graph: comment clarification about shadowed `err`
2015-07-17 13:39:27 -07:00
98ed9a55f4
Merge pull request #14693 from LK4D4/update_libcontainer
...
Update libcontainer
2015-07-17 13:02:04 -07:00
25d9f38852
Merge pull request #13680 from jfrazelle/new-apt-yum-repos
...
WIP: new apt yum repos for release scripts
2015-07-17 12:29:21 -07:00
a763637eae
Merge pull request #13951 from calavera/plugins_path
...
Separate plugin sockets and specs.
2015-07-17 21:11:31 +02:00
e939a30039
Merge pull request #14709 from rhvgoyal/base-size-100G
...
devicemapper: Change default basesize to 100G
2015-07-17 12:41:28 -04:00
fb34537a99
Merge pull request #14685 from Microsoft/10662-revendorhcsshim
...
Windows: Revendor hcsshim@f674a70f1306dbe20b3a516bedd3285d85db60d9
2015-07-17 12:31:58 -04:00
97be366961
Merge pull request #14708 from icecrime/14445_remove_workflow_from_maintainers
...
Remove reviewing process from MAINTAINERS
2015-07-17 09:03:53 -07:00
1b67c38f6f
fix 8926: rmi dangling is unsafe when pulling
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-07-17 11:39:57 -04:00
ff05f9c285
Merge pull request #14445 from icecrime/reviewing_process_and_labels
...
Document and adjust reviewing process and labels
2015-07-17 08:25:41 -07:00
7b83b0e15c
Merge pull request #14605 from brahmaroutu/gccgo_scheduler
...
Go Scheduler issue with sync.Mutex
2015-07-17 08:16:32 -07:00
424d5e55a2
devicemapper: Change default basesize to 100G
...
Current default basesize is 10G. Change it to 100G. Reason being that for
some people 10G is turning out to be too small and we don't have capabilities
to grow it dyamically.
This is just overcommitting and no real space is allocated till container
actually writes data. And this is no different then fs based graphdrivers
where virtual size of a container root is unlimited.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-07-17 11:10:23 -04:00
b900aaac46
Merge pull request #14701 from charleswhchan/patch-6
...
Add missing space
2015-07-17 10:42:48 -04:00
a40e337882
graph: clarify the need for named error
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-07-17 10:01:52 -04:00
c5c98c31a1
Fix InspectExecID test
...
The check for the end of the loop was off by one which is why we saw
errors on the following inpsect() call instead of a timeout
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-17 06:46:37 -07:00
ceca4109fa
Add missing space
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-07-16 22:49:46 -07:00
ac3f7c71b8
Merge pull request #14698 from duglin/AddErr
...
Add missing 'err' to Fatalf to help debug an issue
2015-07-16 21:42:42 -07:00
97c5f64001
Add missing 'err' to Fatalf to help debug an issue
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-16 20:27:14 -07:00
9ca913d0f1
Go Scheduler issue with sync.Mutex using gccgo
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-17 01:33:58 +00:00
15cb7dfc9e
Merge pull request #14578 from mountkin/fix-rmi-image-not-found
...
don't allow deleting the image of running containers
2015-07-16 18:02:51 -07:00
c86189d554
Update libcontainer
...
Replaced github.com/docker/libcontainer with
github.com/opencontainers/runc/libcontaier.
Also I moved AppArmor profile generation to docker.
Main idea of this update is to fix mounting cgroups inside containers.
After updating docker on CI we can even remove dind.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-16 16:02:26 -07:00
8801906ced
Merge pull request #14620 from hqhq/hq_cgroup_ro_optional
...
Remove cgroup read-only flag when privileged
2015-07-16 16:00:02 -07:00
5d3043649a
Merge pull request #14690 from LK4D4/update_libnetwork
...
Update libnetwork
2015-07-16 15:13:24 -07:00
6c0795747b
Separate plugin sockets and specs.
...
Check if there is a plugin socket first under `/run/docker/plugins/NAME.sock`.
If there is no socket for a plugin, check `/etc/docker/plugins/NAME.spec` and
`/usr/lib/docker/plugins/NAME.spec` for spec files.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-16 14:20:07 -07:00
b84ceb3d0a
Update github.com/docker/libnetwork to 2a5cb84758b5115d99d8f82c84845417c6c345a3
...
This update includes removal of libcontainer dependency.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-16 13:58:38 -07:00
212525f951
Merge pull request #14664 from calavera/fix_load_tag_with_digest
...
Check if a tag name to load is a valid digest.
2015-07-16 12:46:05 -07:00
83ad0536c1
Windows: Vendor hcsshim@f674a70f1306dbe20b3a516bedd3285d85db60d9
...
Signed-off-by: John Howard <John.Howard@microsoft.com>
2015-07-16 12:07:20 -07:00
5365e6b463
Merge pull request #13375 from tiborvass/distribution-refactor
...
Vendor distribution client v2
2015-07-16 11:54:08 -07:00
1ec25653d8
Check if a tag name to load is a valid digest.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-16 10:53:56 -07:00
David Calavera
Hu Keping
Tibor Vass
Antonio Murdaca
Sebastiaan van Stijn
Qiang Huang
Lei
Sven Dowideit
Mary Anthony
Arnaud Porterie
Alexander Morozov
Doug Davis
Alexander Morozov
Jessie Frazelle
Brian Goff
Ma Shimiao
Vivek Goyal
Vincent Batts
Charles Chan
root
Stephen Day
John Howard