Commit Graph

10184 Commits

Author SHA1 Message Date
b22bbbc6cc Bump docs and api to 1.15
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: e261618b24b6837c820dccd8fa734eafc8b7f399
Component: engine
2014-08-26 13:08:50 +04:00
f9e7d27fe5 Merge pull request #7733 from Djelibeybi/oraclelinux-docs
Oracle Linux docs
Upstream-commit: a05d8d4f4ffd67be34738c80b862ef949dddef65
Component: engine
2014-08-25 18:14:36 -07:00
1dae3fa4de Add Oracle Linux specific documentation for installation of Docker from Oracle Linux repositories on Oracle Linux 6 and 7.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: fcad8ee83a2cf9192ba4f9ec7d5c1d0b03a6aa47
Component: engine
2014-08-26 11:10:09 +10:00
bd4553339f Merge pull request #7732 from SvenDowideit/ubuntu-backported-kernel
Ubuntu backported kernel
Upstream-commit: 849086d3d965cea7d7e04b3559edc9c903e30ba6
Component: engine
2014-08-25 17:16:34 -07:00
cd586bd31e small word change
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 93d574298da0f420c19db52b75ebf31ed3cb2ec9
Component: engine
2014-08-26 10:15:12 +10:00
a3c910b1d1 Merge pull request #7603 from kuon/centos7
Added manual installation instruction for Centos7 and note about firewalld.
Upstream-commit: 97c7b0115b62a698123eec1b2548ff85937ba35a
Component: engine
2014-08-25 16:49:09 -07:00
4d0ceee016 Merge pull request #7574 from crosbymichael/update-restart-docs
Update flag usages and docs for max restart count
Upstream-commit: b0abd6de635e3bac9c6aa40aa98f53a5d9e15f98
Component: engine
2014-08-25 16:26:06 -07:00
feacc1f671 Merge pull request #7622 from rajdeepd/master
Added Test case for Engine shutdown
Upstream-commit: 2bdfbab23dc0b57fda9620a8a5a583da5e051e49
Component: engine
2014-08-25 15:57:11 -07:00
601611b982 Merge pull request #7629 from LK4D4/fix_follow_hang_on_stop
Fix logs -f hanging on stopped containers
Upstream-commit: 228eda4fd5a79dfe5eab1194f4133a71472fef0e
Component: engine
2014-08-25 15:24:20 -07:00
6a5005c54d Merge pull request #7716 from coolljt0725/master
Fix the bug of docker import command when import a image with a tag use format 'URL|- [REPOSITORY[:TAG]]'
Upstream-commit: 7556a4245364277f5747149c096a23ae6731fb4a
Component: engine
2014-08-25 15:11:50 -07:00
a85c5401f4 add docker import test with a tag. Fixes #7714
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 7e72ed70f9cac871b845bebef0f96178c0f1a25c
Component: engine
2014-08-26 15:51:22 +08:00
8270e6cad2 Fix the bug of docker import command when import a image with a tag use format 'URL|- [REPOSITORY[:TAG]]'.Fixes #7714
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 79cf8395277002011b7632e5a040d4f4a7a25d1f
Component: engine
2014-08-26 15:51:22 +08:00
ddfb7cb734 Merge pull request #7659 from somaopensource/soma
daemon: rename from "delete" job to "rm"
Upstream-commit: 34438efffefdf4a2d93e5b2192dff4645828d745
Component: engine
2014-08-25 15:54:14 -04:00
658ff140b7 Merge pull request #7649 from tianon/vendor-optional-go
Optionalize the "hg clone" of Go, since it takes forever
Upstream-commit: 321df7fd6112776e5f9be3e6c950acd6895c4fd6
Component: engine
2014-08-25 12:00:23 -07:00
534d06bd81 Merge pull request #7683 from LK4D4/fix_build_hang_pipe_#7680
Skip permissions check on named pipes
Upstream-commit: d1544a09309afc637756bb1d69d0b2a65a90217a
Component: engine
2014-08-25 12:00:11 -07:00
cb2b33e883 Skip permissions check on named pipes
Fixes #7680

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 07f2e794867030c755901ae5479df03e3c4ce189
Component: engine
2014-08-25 22:59:53 +04:00
05788083a7 Merge pull request #7691 from carmstrong/patch-1
Fix typo for --restart deprecation
Upstream-commit: e1defe71c39bd810f74159436abd508adcabbfc1
Component: engine
2014-08-25 11:13:27 -07:00
bb629d20ef Merge pull request #7725 from erikh/fix_registry_test
fix return values in registry mock service
Upstream-commit: 2c9789bbf78457ed5f76230bf5802802aa7e42a0
Component: engine
2014-08-25 10:56:00 -07:00
579f334a23 fix return values in registry mock service
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: e81b68692408ef717c2228986cc74102cae55772
Component: engine
2014-08-25 10:29:38 -07:00
1feb361a73 Merge pull request #7700 from jamtur01/relnotes
Removed deprecated release notes
Upstream-commit: bef33cf88a761592d27d554828451f131a53d601
Component: engine
2014-08-25 07:13:11 -07:00
3af44a7cdf Added manual installation instruction for Centos7.
Added a note about firewalld.

Signed-off-by: Nicolas Goy <kuon@goyman.com>
Upstream-commit: d4a53a7bce0205ba0cb693b43091b78f6ce8702a
Component: engine
2014-08-25 04:00:11 +02:00
be7fbe7b1d Removed deprecated release notes
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: df38eb4d43b03728253593622fe4285e99d0784f
Component: engine
2014-08-23 20:01:41 -04:00
21c698ffdf Fix typo for --restart deprecation
Signed-off-by: Chris Armstrong <chris@opdemand.com>
Upstream-commit: ef9a5926e9af408d68b3c68638a69727e42079fa
Component: engine
2014-08-22 12:56:43 -07:00
ea03464517 Merge pull request #7684 from averagehuman/patch-1
Update usingdocker.md
Upstream-commit: 6bc773b2c1cbce828dde3a5bee7d7d4dd893ec3b
Component: engine
2014-08-22 13:16:33 -04:00
5b6d059957 Update usingdocker.md
Minor rewording and removal of unnecessary apostrophe.
Upstream-commit: fe845c4da88ef15baf45fa600a077a75f3634c40
Component: engine
2014-08-22 17:48:26 +01:00
b702e29c5d Merge pull request #7632 from erikh/fix_check_config
fix check-config.sh to check for CGROUP_PERF
Upstream-commit: 651f521e1772e64f267e448bf88f0be246248cc8
Component: engine
2014-08-22 11:42:08 -05:00
f77d69a509 Merge pull request #7638 from vivekdasgupta/minor-fixes
Fix data space reporting from Kb/Mb to KB/MB
Upstream-commit: 094cd7040b538910f6b4d1d362162185099eb5af
Component: engine
2014-08-22 11:40:49 -05:00
453c13d851 Merge pull request #7668 from docker/merge_release_v1.2.0
Merge release v1.2.0
Upstream-commit: bd7c7febb9b825a1480319a02bdbe7e77736f5c6
Component: engine
2014-08-22 11:18:48 -05:00
2ba23b90dc Change version to 1.2.0-dev
Upstream-commit: 61b309f0d280b3b05909f294a30d73317a9d6a4d
Component: engine
2014-08-21 15:55:00 -04:00
49ee40153f Merge remote-tracking branch 'origin/release'
Upstream-commit: 380aef2dc1d99ccb070f46d5fc57841ab5e17714
Component: engine
2014-08-21 15:54:02 -04:00
ecf3f11605 Merge pull request #7644 from vieux/bump_v1.2.0
Bump v1.2.0
Upstream-commit: 7649264eb89614ddaed331560622ea0eb92c299c
Component: engine
2014-08-21 14:32:00 -05:00
b6a88dc489 Clean up typos in hub_registry_spec.md
Couple of instances of incorrect articles (e.g. "an Docker Hub").
Upstream-commit: c87d9a1de62678743436887edecdbde2e5a67a1a
Component: engine
2014-08-21 11:04:25 -07:00
65adfb2362 Fix data space reporting from Kb/Mb to KB/MB
Docker-DCO-1.1-Signed-off-by: Vivek Dasgupta <vdasgupt@redhat.com> (github: vivekdasgupta)
Upstream-commit: a327d9b91edf6d36ee5b286ebe968bcca6658f5b
Component: engine
2014-08-21 21:03:44 +05:30
87669d6e48 daemon: rename from "delete" job to "rm"
This commit fixes following FIXMEs:

// FIXME: rename "delete" to "rm" for consistency with the CLI command
// FIXME: rename ContainerDestroy to ContainerRm for consistency with the CLI command

Signed-off-by: lim seong yeol <seongyeol37@gmail.com>
Upstream-commit: 239e932485c3e0f72a4f88ce1301ebe269eb2e27
Component: engine
2014-08-21 19:58:26 +09:00
3228a8d12a Add link to Ubuntu notes about LTSEnablementStack
When running Ubuntu with a graphical environment, the kernel version MUST match the Xorg version. Only installing the suggested packages above breaks Unity for anything other than 2D mode (in VMware and probably native).
Signed-off-by: Ethan Spoelstra <ewspoelstra@computerphreaks.com>
Upstream-commit: 27f44b9bb162dce988913b981f1f21eb149d875f
Component: engine
2014-08-20 22:23:34 -05:00
748f96be00 Bump version to v1.2.0
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: fa7b24f2c3948d1eb52453c609417a6bc7eba5dd
Component: engine
2014-08-20 21:11:18 +00:00
8ccf0a6281 Merge remote-tracking branch 'origin/master' into bump_v1.2.0
Conflicts:
	VERSION
	daemon/container.go
	daemon/daemon.go

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 380129d0d7e9b2dbec27aef7186ce5eddd3a3076
Component: engine
2014-08-20 20:19:03 +00:00
8d2d67cdd2 Optionalize the "hg clone" of Go, since it takes forever (now, to update our Go version too, we need to explicitly "./hack/vendor.sh --go")
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 78c68825671eb1bd102d76d671ace9de5a37aa19
Component: engine
2014-08-20 14:17:11 -06:00
06f9173afa Merge pull request #7648 from crosbymichael/update-libcontainer-aug5
Update libcontainer to db65c35051d05f3fb218a0e84a1
Upstream-commit: b1d20c483ae91870d2525fa2a302d4461cbe8129
Component: engine
2014-08-20 15:15:23 -05:00
b642305530 Merge pull request #7634 from krrg/patch-1
Update openSUSE installation instructions
Upstream-commit: 997336fd95270a35b0dc8cc17aa969fd8c2e6f81
Component: engine
2014-08-20 14:46:41 -04:00
065feffb73 Update libcontainer to db65c35051d05f3fb218a0e84a1
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 624b944896d47031f9df166b4275037664a3cb23
Component: engine
2014-08-20 11:19:55 -07:00
652c673ef1 Merge pull request #7495 from sontags/enable_search_on_private_reg
Enable `docker search` on private docker registry.
Upstream-commit: 2eb26991f4ef47225a7312e65660debf1d8f6b48
Component: engine
2014-08-20 18:10:29 +02:00
04302ddd9e Test for following logs for stopped container
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: f04ef96e076b811eca1f7f230b126572369ccc44
Component: engine
2014-08-20 20:02:56 +04:00
0186e144d0 Merge pull request #5129 from vieux/host_resolv
allow /etc/hosts /etc/resolv.conf and /etc/hostname to be changed
Upstream-commit: 94fbcea7a305e9810f3f6349fe9a778c90a25993
Component: engine
2014-08-20 11:02:36 -05:00
34b12370d2 fix check-config.sh to check for CGROUP_PERF
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: ce3c1f376c21810fd6ec062af810d18682fa2d78
Component: engine
2014-08-20 13:37:39 +00:00
55a0a050b4 Merge pull request #7633 from fredlf/root_builder_warning
Added warning re: using root for dockerfile root. Fixes #7612
Upstream-commit: 494bea9fba229dd388d8912fe72936af4a54f73b
Component: engine
2014-08-20 08:02:38 -04:00
a4c03cd9ac Merge pull request #7635 from bfirsh/docs-https-newsletter-url
Use HTTPS for newsletter signup form
Upstream-commit: 0d26b7cc6d9c5625e5cdc483db90d9ae1228209c
Component: engine
2014-08-20 08:01:27 -04:00
93cdd9219d Merge pull request #7640 from xiaods/develop
Cleanup: correct cli --volumes-from description
Upstream-commit: 9faf0254ef0871d5113cc91319228b8472474d34
Component: engine
2014-08-20 08:01:05 -04:00
46c8de1eaa Cleanup: correct cli --volumes-from description
issue #7580 volumes-from comma separated list mentioned this case.

Options like --volumes-from=[] indicate they can be specified multiple times:
docker run -it --rm --volumes-from TEST_DATA --volumes-from TEST_DATA2 ubuntu bash

Signed-off-by: Deshi Xiao <dxiao@redhat.com>
Upstream-commit: 4d0b88c52f896fe159fe2b1dfd7bdb8116c31da3
Component: engine
2014-08-20 16:31:04 +08:00
4300ef9d0c Fixed a typo and added a bit based on Sven's feedback
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 98dd982586ed9fd99853001d4a27503180e432c4
Component: engine
2014-08-19 17:22:11 -07:00