bfde6861a0
Promote volume drivers from experimental to master.
...
Remove volume stubs and use the experimental path as the only path.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: c4d45b6a29a91f2fb5d7a51ac36572f2a9b295c6
Component: engine
2015-07-21 09:32:44 -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
9a4caf4c8f
Merge pull request #14614 from hqhq/hq_simplify_swappiness
...
Simplify swappiness check
Upstream-commit: 46d7762f26adcb51b29538ec81cb29ef0e3e626e
Component: engine
2015-07-20 13:51:39 +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
2591c62680
Merge pull request #14747 from moxiegirl/update-docs-dockerfile
...
Updating to use the new base
Upstream-commit: 008d57bf7f8c70a11f194d1cfaf940775534c278
Component: engine
2015-07-20 12:00:02 +10: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
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
f610796e09
Merge pull request #14722 from duglin/FixInspectExecIDTest
...
Move inspect into the loop on InspectExecID test
Upstream-commit: a0a0b8499e068c5c9a4caf5bab83d39ddd362078
Component: engine
2015-07-17 18:21:49 -07: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
621d0f422a
Merge pull request #14701 from charleswhchan/patch-6
...
Add missing space
Upstream-commit: b900aaac46ec9a34a18d24bfa1072f46030da930
Component: engine
2015-07-17 10:42:48 -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
7744d0b3be
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 >
Upstream-commit: c5c98c31a184837c7f5b1f43d8ef18a676a8bf30
Component: engine
2015-07-17 06:46:37 -07:00
e191f54133
Add missing space
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: ceca4109fac5367f7c354b675cadf086dc1e09c3
Component: engine
2015-07-16 22:49:46 -07:00
63609ba888
Merge pull request #14698 from duglin/AddErr
...
Add missing 'err' to Fatalf to help debug an issue
Upstream-commit: ac3f7c71b8e82b5faf014b13138219723f6a0c67
Component: engine
2015-07-16 21:42:42 -07:00
d7c4893fc7
Add missing 'err' to Fatalf to help debug an issue
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 97c5f64001af1ac6c9035af672e45051cab55f62
Component: engine
2015-07-16 20:27:14 -07:00
d905b9673f
Go Scheduler issue with sync.Mutex using gccgo
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 9ca913d0f168d943f6e15f32f52f777732b354a7
Component: engine
2015-07-17 01:33:58 +00:00
8c0a231700
Merge pull request #14578 from mountkin/fix-rmi-image-not-found
...
don't allow deleting the image of running containers
Upstream-commit: 15cb7dfc9ecb4600fc514ceef478f8b8ea631b36
Component: engine
2015-07-16 18:02:51 -07:00
d9e652a366
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 >
Upstream-commit: c86189d554ba14aa04b6314970d3699e5ddbf4de
Component: engine
2015-07-16 16:02:26 -07:00
d192eb2289
Merge pull request #14620 from hqhq/hq_cgroup_ro_optional
...
Remove cgroup read-only flag when privileged
Upstream-commit: 8801906cedb73f171a8556294e78d649fee3db32
Component: engine
2015-07-16 16:00:02 -07:00
a1797b4d94
Merge pull request #14690 from LK4D4/update_libnetwork
...
Update libnetwork
Upstream-commit: 5d3043649a6ffc35fbc48d19b0ccccb60d305b8a
Component: engine
2015-07-16 15:13:24 -07:00
12460b884d
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 >
Upstream-commit: 6c0795747b00589641eb34eb7adce05a56d8840f
Component: engine
2015-07-16 14:20:07 -07:00
8f72c020f5
Update github.com/docker/libnetwork to 2a5cb84758b5115d99d8f82c84845417c6c345a3
...
This update includes removal of libcontainer dependency.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: b84ceb3d0ac53690f19cfc05f6b0e91e1998aa41
Component: engine
2015-07-16 13:58:38 -07:00
8755c824aa
Merge pull request #14664 from calavera/fix_load_tag_with_digest
...
Check if a tag name to load is a valid digest.
Upstream-commit: 212525f951d9c92ad4cbf7628e7024930da080ac
Component: engine
2015-07-16 12:46:05 -07:00
49b7af2492
Windows: Vendor hcsshim@f674a70f1306dbe20b3a516bedd3285d85db60d9
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
Upstream-commit: 83ad0536c130cbd0705cec27866ff4f770923912
Component: engine
2015-07-16 12:07:20 -07:00
186b6eae49
Merge pull request #13375 from tiborvass/distribution-refactor
...
Vendor distribution client v2
Upstream-commit: 5365e6b463b7b528b61040d68c9e55210452a89a
Component: engine
2015-07-16 11:54:08 -07:00
