72f5aa2fcc
Docs: update the devicemapper default basesize from 10G to 100G
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 36cc6a985be61cdcd9356385bc722c5ccad636b9
Component: engine
2015-07-21 20:46:31 +08:00
e8b152f0c3
Merge pull request #14779 from duglin/BetterErrMsg14774
...
Add better output for TestLinksEtcHostsContentMatch to help debug #14774
Upstream-commit: efd56bbe6fe9b2725d45327e84b39601c726ca15
Component: engine
2015-07-20 20:40:06 -04:00
a69da4951f
Merge pull request #14762 from LK4D4/lint_reexec
...
Add docstring to reexec.Command
Upstream-commit: 4d0990a753abbf1c7709dec7ea48a74ff87845fd
Component: engine
2015-07-20 20:37:27 -04:00
43e12ee399
Merge pull request #14776 from MHBauer/cliconfig-lint
...
golint fixes for cliconfig
Upstream-commit: 4c0fb857298fc8a6fcd97f53e017068ec056aba9
Component: engine
2015-07-21 02:22:09 +02:00
bd707ce47e
Merge pull request #14775 from runcom/move-nat-tests
...
move nat tests from container's unit test to nat's ones
Upstream-commit: 09a3b57f941a9a3c3b7cbc35f2c8d1ff9bcea26f
Component: engine
2015-07-20 20:06:34 -04:00
2f038465a8
Add docstring to reexec.Command
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 9738b9319b7a5133653c4912db8ec361af5847fc
Component: engine
2015-07-20 17:00:18 -07:00
66d10b96a0
golint for cliconfig
...
- fully capitalize HTTP in HTTPHeaders
- comment for CONFIGFILE
- camelcase and privatize oldConfigfile, defaultIndexserver
- remove unused var errConfigFileMissing
- comments for methods and functions throughout
- external references to renamed variables changed
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: dea49b7474f0efcefe4618b6133330f0bb5e2c84
Component: engine
2015-07-20 16:48:58 -07:00
ae51c9aa8a
Add better output for TestLinksEtcHostsContentMatch to help debug #14774
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 6751a49d143e329668e4bbc3214c0bb5e4d02eeb
Component: engine
2015-07-20 16:46:51 -07:00
d803cf51a9
Merge pull request #14691 from Microsoft/10662-start
...
Windows: hostconfig on start
Upstream-commit: 37d737fc2ceba8d4daa3c3785f6050440a6a40c2
Component: engine
2015-07-21 00:52:19 +02:00
0388c1eb6b
move nat tests from container's unit test to nat's ones
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: f2aff584830db5257489bcf76a4b364b79534b77
Component: engine
2015-07-21 00:29:24 +02:00
1ce6cfdc98
Merge pull request #14771 from Microsoft/10662-image2image
...
Fixing Image struct to no longer use Graph.
Upstream-commit: cc7fe0d2d96137e000f98d3917e60ab904e5f170
Component: engine
2015-07-20 15:25:06 -07:00
63185229e8
Merge pull request #14768 from fredlf/style-guide-edits
...
Small edits and clean up
Upstream-commit: 8b7923620ac5f7a40806e2ed22616231a5965b14
Component: engine
2015-07-21 00:23:56 +02:00
b70343dc2b
Fixing Image struct to no longer use Graph.
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9001ea26e7821239207586ad23c78c67d6926bfc
Component: engine
2015-07-20 13:59:53 -07:00
7eece0a108
Merge pull request #14764 from sevki/14756-lint
...
golint fix TLs->TLS in docker/
Upstream-commit: bd8386c127c09fd0392dd8b967b246c3bfa1362f
Component: engine
2015-07-20 13:19:42 -07:00
c8933bf1c2
Small edits and clean up
...
Signed-off-by: Fred Lifton <fred.lifton@docker.com >
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 6609cfb5e743b67e21c60296b0edda643551aa3b
Component: engine
2015-07-20 11:59:48 -07:00
27f60d9502
fix mixed typo TlS -> TLS
...
Signed-off-by: Sevki Hasirci <s@sevki.org >
Upstream-commit: ce3156f1ebab0857b686682b317410f0eb27f6d5
Component: engine
2015-07-20 21:14:45 +03:00
e13211498b
golint fix TLs->TLS in docker/
...
Signed-off-by: Sevki Hasirci <s@sevki.org >
Upstream-commit: 16ea3cf3a3cd0ce19f6c55138992442cd6cfddc8
Component: engine
2015-07-20 20:50:03 +03:00
e45c5f53f4
Merge pull request #14746 from jfrazelle/remove-rhel-centos-6-rpm
...
remove centos/rhel 6 from rpm builder
Upstream-commit: 46cbfcb168e046041fe79f8294223402d7396021
Component: engine
2015-07-20 10:44:18 -07:00
42d9d20733
Merge pull request #14741 from HuKeping/ci-refactor
...
CI: use dockercmd when possible
Upstream-commit: fc2f90fc63014db95fd9d9052218d72d5ca1d82c
Component: engine
2015-07-20 09:49:40 -07:00
56aba58eb4
CI: use dockercmd when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 27ac154d05cf9f7aa1e9cbebe3c7769fa746de1e
Component: engine
2015-07-21 04:40:15 +08:00
f5db7bfda7
Merge pull request #14671 from hqhq/hq_use_dockerCmd
...
Use dockerCmd when possible
Upstream-commit: ee7af0d2cbefac944bcad387a1dad65cf70691aa
Component: engine
2015-07-20 09:44:42 -07:00
308bd57d37
Merge pull request #14716 from LK4D4/update_libcontainer
...
Update libcontainer to v0.0.2
Upstream-commit: 77bbee3d00fd32f0843e4dc9bb12d366883222b5
Component: engine
2015-07-20 11:33:19 -04:00
45b325ef2e
Merge pull request #14724 from coolljt0725/14603-dockerCmd-integration-cli-3
...
Refactor: use dockerCmd when possible in integraiton-cli tests
Upstream-commit: c6a3517246f8b94158270f68955d966f902c8ab0
Component: engine
2015-07-20 16:00:38 +02:00
da9ff50d73
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 >
Upstream-commit: 6f8ddec1d0e67058c7a4a15c7d4d9a75bc1e5dea
Component: engine
2015-07-20 16:10:10 +08:00
0b00c6ae1a
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 >
Upstream-commit: 668e2369cc5d57d634d0e559241ea4c4cbde65d8
Component: engine
2015-07-20 14:55:40 +08:00
9e76137f40
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 >
Upstream-commit: eef6eda7d295a7577bdbe2e4630ce3350c6d7701
Component: engine
2015-07-20 14:44:22 +08:00
e8c2670622
Updating to use the new base
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: e0bceb70647499ec3660204731a1b42ced927492
Component: engine
2015-07-19 15:39:43 -07:00
30e998cb02
remove centos6 from rpm builder
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: af5fb9b7d0722783d6ffcc9d36e36e158d1b84b0
Component: engine
2015-07-19 14:30:48 -07:00
6212ad7f28
Merge pull request #14715 from icecrime/14365_remove_rhel6_from_docs
...
Update RHEL/Centos/Fedora installation docs
Upstream-commit: ccc78c9968b6cfd6cdf85c28953453c2cd0aa95b
Component: engine
2015-07-19 13:00:50 -07:00
a68f23c05d
Merge pull request #14676 from duglin/Issue14675
...
Add missing 'Names' field to /containers/json API output
Upstream-commit: 32764fe3b907dfe4d3e833c19fc605859adba47e
Component: engine
2015-07-19 06:53:25 -07:00
2138eae5bf
Merge pull request #14667 from charleswhchan/patch-5
...
Trim excess from image. Based on the context, the email itself is sufficient.
Upstream-commit: a89370039a65f235d3dde5d36f20d0f463c615e9
Component: engine
2015-07-18 11:14:28 +02:00
4c5a8b7b16
Add dockerCmdWithStdoutStderr function
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: c6cde91b7d2cb3671dc55cafc5ab693f9cb17cc8
Component: engine
2015-07-18 10:48:28 +08:00
68f2260858
Move inspect into the loop on InspectExecID test
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: f06620ece3557eb263b221e476cef2955235ba75
Component: engine
2015-07-17 17:30:24 -07:00
4cbf8e8120
Merge pull request #13681 from tiborvass/carry-11784
...
Carry 11784: rmi dangling is unsafe when pulling
Upstream-commit: 7f353a11e4d40d08d1bd15df24c87a95d8cd9a02
Component: engine
2015-07-17 16:17:18 -07:00
d9c672b3bd
Update libcontainer to v0.0.2
...
This is fix for proper setup of nested containers cgroups.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: f0f261a899acf3c11d01c97e2503ec0ddb200232
Component: engine
2015-07-17 15:05:17 -07:00
a752ea3772
Merge pull request #14706 from duglin/FixInspectTest
...
Fix InspectExecID test
Upstream-commit: 465192cb2885acfe71509827ff2011042e0c99b9
Component: engine
2015-07-17 14:37:23 -07:00
428f8fb7db
Update RHEL/Centos/Fedora installation docs
...
Remove mentions of older systems.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 340bd135ddf9a053dc6106a874e70e021a9e6acb
Component: engine
2015-07-17 14:04:19 -07:00
c4955551ce
Merge pull request #11485 from wlan0/rollover_log
...
Add rollover log driver, and --log-driver-opts flag
Upstream-commit: 415f744d0c5980d332ab54c80f1521a0e5b4d401
Component: engine
2015-07-17 22:41:26 +02:00
6e2e8208f2
Merge pull request #14413 from vbatts/vbatts-graph-cleanup
...
graph: comment clarification about shadowed `err`
Upstream-commit: a192105d3b377ecb55f352a42079063f0d8f053f
Component: engine
2015-07-17 13:39:27 -07:00
8a425b30fb
Merge pull request #14693 from LK4D4/update_libcontainer
...
Update libcontainer
Upstream-commit: 98ed9a55f42f7c86c7c9cddb27f6807e7e77c889
Component: engine
2015-07-17 13:02:04 -07:00
63fd915fb7
Merge pull request #13680 from jfrazelle/new-apt-yum-repos
...
WIP: new apt yum repos for release scripts
Upstream-commit: 25d9f38852173950a4a4192746a56bef39b24fd9
Component: engine
2015-07-17 12:29:21 -07:00
4daf251bed
Merge pull request #13951 from calavera/plugins_path
...
Separate plugin sockets and specs.
Upstream-commit: a763637eae7dcf5d870e9d035be5baf94d72e2c5
Component: engine
2015-07-17 21:11:31 +02:00
2d196d14b3
Merge pull request #14709 from rhvgoyal/base-size-100G
...
devicemapper: Change default basesize to 100G
Upstream-commit: e939a3003910c705a662e53ee3c47aa718d25fa1
Component: engine
2015-07-17 12:41:28 -04:00
b8696f7d26
Merge pull request #14685 from Microsoft/10662-revendorhcsshim
...
Windows: Revendor hcsshim@f674a70f1306dbe20b3a516bedd3285d85db60d9
Upstream-commit: fb34537a9963b3fc3aa9c74046becbc90a1cba07
Component: engine
2015-07-17 12:31:58 -04:00
124ac833af
Merge pull request #14708 from icecrime/14445_remove_workflow_from_maintainers
...
Remove reviewing process from MAINTAINERS
Upstream-commit: 97be366961ed31dd399d8cbb9f576a4a4e2a3f2b
Component: engine
2015-07-17 09:03:53 -07:00
371476f565
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 >
Upstream-commit: 1b67c38f6f4a709e1d159445b56f0beee8cfad3a
Component: engine
2015-07-17 11:39:57 -04:00
0bd2cb4373
Merge pull request #14445 from icecrime/reviewing_process_and_labels
...
Document and adjust reviewing process and labels
Upstream-commit: ff05f9c285175eedfb663e0d4b7bd7cca29d7be3
Component: engine
2015-07-17 08:25:41 -07:00
4b2f3f5f76
Merge pull request #14605 from brahmaroutu/gccgo_scheduler
...
Go Scheduler issue with sync.Mutex
Upstream-commit: 7b83b0e15c4507871ed411aca5610aa7da751bd9
Component: engine
2015-07-17 08:16:32 -07:00
5fc55316cd
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 >
Upstream-commit: 424d5e55a2f863b8eadab578e3ba647de09a4354
Component: engine
2015-07-17 11:10:23 -04:00
e2d31e5c38
graph: clarify the need for named error
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: a40e337882dfe3f34af44a9f2aec2ed96dcce455
Component: engine
2015-07-17 10:01:52 -04:00
