49ecfd85ad
Remove the redundant include_search in mkdocs.yml
...
Upstream-commit: b92d7cd60db0a03b0ace62a2a6c11df9f64f4256
Component: engine
2014-11-10 20:23:46 +08:00
67f7f0aa89
Merge pull request #9052 from andreyst/master
...
Fix typo in Docker Links chapter of User Guide
Upstream-commit: e4fe85fc9554c09c210bb441161906f34ebe90db
Component: engine
2014-11-10 00:10:38 -05:00
1089b95bed
Merge pull request #9057 from andi5/typo-best-practices
...
Fix mkdir typo in dockerfile_best-practices.md.
Upstream-commit: 1e75c9e8b40eea56e355f825b764d72ec5a89c19
Component: engine
2014-11-10 00:10:20 -05:00
f233f91529
Merge pull request #9029 from ovh/fix/doc
...
Fix Docker Hub tags list specification
Upstream-commit: 2d30473927b63788e61dfff686e63ae52fdb2687
Component: engine
2014-11-10 00:05:34 -05:00
dc90086a2e
Fix mkdir typo in dockerfile_best-practices.md.
...
Upstream-commit: b95f9c10ff2bd05fc2d30b30bebb8174883c683a
Component: engine
2014-11-10 01:00:05 +01:00
7b7fbcfc68
Fix typo in Docker Links chapter of User Guide
...
Upstream-commit: 932cc230814ba642c493c77d05932f63c0ef3e7f
Component: engine
2014-11-09 23:23:45 +03:00
5ab5947fb6
*: transition to new libcontainer/user API
...
This patch fixes the compilation errors in Docker due to changes in the
libcontainer/user API. There is no functionality change due to this
patch.
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Upstream-commit: 3ac4aa0d6ba6cb10b9a46df40f18b81dba137840
Component: engine
2014-11-08 10:03:12 +11:00
da278331e0
vendor: update vendor'd libcontainer version
...
This patch updates the vendor'd libcontainer version, so that Docker can
take advantage of the updates to the `user` API.
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
Upstream-commit: a10cca257f678e5e3c866b3c35f77877fe4789d2
Component: engine
2014-11-08 09:57:20 +11:00
283e88e070
Merge pull request #8931 from vbatts/vbatts-mount_pid_mountinfo
...
pkg/mount: mountinfo from specified pid
Upstream-commit: 349f67632f47a399a6a97a4a4c684b64ba8c6940
Component: engine
2014-11-07 12:04:52 -08:00
56dd7dc6ae
pkg/mount: mountinfo from specified pid
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 64e7a1722daa6508f38287c6b8eee72850f22a86
Component: engine
2014-11-07 13:37:23 -05:00
2531bb36a4
Fix Docker Hub tags list specification
...
The current implementation of the Docker Hub returns a list of objects
containing the tag name and the layer id.
Docker-DCO-1.1-Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net >
Upstream-commit: c30ccc62e447ed570ca283feedd872eb359d457b
Component: engine
2014-11-07 17:16:42 +01:00
b3094dae92
Merge pull request #8970 from georgexsh/hyphen
...
unify `–`(en dash) to `-` when specifying options
Upstream-commit: 3afe9dbd246982dd82f2c53b647be29ea89a6485
Component: engine
2014-11-06 14:48:48 -08:00
951245c785
Merge pull request #8711 from duglin/Issue8160
...
Add import/pull events to the stream
Upstream-commit: 734419e9c7541286e94f28c90d5ebea3a627aae5
Component: engine
2014-11-06 14:29:02 -08:00
7c60de6972
Add import/pull events to the stream
...
Closes #8160
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: ef7415258ba5195af7a890d1d52214b3a181a379
Component: engine
2014-11-06 12:12:41 -08:00
d0c1f63128
Merge pull request #8963 from blakery/master
...
Cleanup: made GetDefaultNetworkMtu private
Upstream-commit: dd62d256cb1d43baa93befab8a9d264b1c418c76
Component: engine
2014-11-06 12:02:18 -08:00
973d8d4d59
Merge pull request #8977 from LK4D4/vet_fixes
...
Fix vet errors
Upstream-commit: 546884fd20b0a3e7692f1edf5415b48df65a2e7f
Component: engine
2014-11-06 11:59:05 -08:00
a17f18fb0b
Merge pull request #8983 from LK4D4/consistent_hosts
...
Consistent hosts
Upstream-commit: 6a6be5bd5afcd4192dfc5d7bc5163b318afb15cc
Component: engine
2014-11-06 11:51:28 -08:00
b57c92156c
Test for etchosts consistency
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 048d0c4e84aa850f28f9f12735d274a887c79509
Component: engine
2014-11-06 11:36:09 -08:00
8e42183a10
Make /etc/hosts records consistent
...
Fixes #8972
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 6cbe1fa726fb88a1743c3a3da5e699c9bb3ae55a
Component: engine
2014-11-06 11:36:00 -08:00
fc5e4e5515
Merge pull request #9005 from vbatts/vbatts-devmapper_add_maintainer
...
devmapper: add vbatts to MAINTAINERS
Upstream-commit: 55f9b0c874aeddb24e8af0e0026f39115d5440c4
Component: engine
2014-11-06 11:26:40 -08:00
b19230c3ba
devmapper: add vbatts to MAINTAINERS
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 2fbfa29318f66aac131bdddd9b32f28b7b7e508a
Component: engine
2014-11-06 14:06:52 -05:00
dc47107b5a
Merge pull request #8988 from crosbymichael/update-libcontainer-nov1
...
Update libcontainer to fd6df76562137aa3b18e44b790c
Upstream-commit: 68a25a5b74af10dd7d0af5f05556128540f9cedc
Component: engine
2014-11-06 11:02:29 -08:00
8229b20bed
Merge pull request #8990 from duglin/Issue8379a
...
Make sure that if a container can't start we set the exitcode to non-zero value
Upstream-commit: a72f3c568bc2f73869dc57d9fce43b920ee8a9d7
Component: engine
2014-11-06 10:44:10 -08:00
7e5982b03e
Merge pull request #8998 from yoheiueda/dont-remove-tmpdir
...
Fix the unit test not to remove /tmp
Upstream-commit: ff911d5f34f20d34821f10ad158c6ddb0ade8a66
Component: engine
2014-11-06 08:59:02 -08:00
e71a5595e6
Fix the unit test not to remove /tmp
...
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com >
Upstream-commit: 2329354dc3e874b6e93b7b9feafa9c67172840fc
Component: engine
2014-11-07 02:43:59 +09:00
482e79cef7
Merge pull request #8974 from unclejack/bump_fpm
...
bump fpm to 1.3.2
Upstream-commit: b35a0ba81b1fe4d689c49931bb399384592aacd4
Component: engine
2014-11-06 09:37:25 -07:00
126ed13eb1
Merge pull request #8953 from golubbe/master
...
Create governance doc and show links to DGAB materials in google doc
Upstream-commit: 6fcc9141d71796822ac87e2c54d253c7abd27726
Component: engine
2014-11-05 22:13:05 -08:00
811492e0cb
See #8379 - if the container doesn't start I added code to make sure that if no other processing sets the container.exitCode to a non-zero value when we make sure its done before we return. I also made sure that while trying to start the CMD/ENTRYPOINT, if it fails, then we set the container.exitCode to the exitStatus from the exec().
...
Closes #8379
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 69a5b827dcf01a6de5949a161606058017014cdc
Component: engine
2014-11-05 18:23:42 -08:00
cf55a62eb5
Update docker with syncpipe changes
...
We removed the syncpipe package and replaced it with specific calls to
create a new *os.File from a specified fd passed to the process. This
reduced code and an extra object to manage the container's init
lifecycle.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: ed556fb38f4d1cba1460650f703cc8147a7b8f32
Component: engine
2014-11-06 01:14:13 +00:00
a1e154d1fe
Update libcontainer to fd6df76562137aa3b18e44b790c
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 7f5ebdcaac51a3a0cf3805397748154d3743469c
Component: engine
2014-11-06 01:12:41 +00:00
9c47f4a11e
Merge pull request #8683 from cpuguy83/fix_api_docs
...
Bring API docs inline with 1.3
Upstream-commit: 56261daf32a1c5490ce0b5b500bf4245b6ac63bd
Component: engine
2014-11-05 16:34:27 -08:00
12147a008d
Close stdin after execution with docker exec -i
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 165624062e1ac105b6e45beba51cec6439918f11
Component: engine
2014-11-05 15:12:24 -08:00
0b7ffe7460
Create GOVERNANCE.md
...
Information on Governance Advisory Board and associated proposals
Signed-off-by: Ben Golub <ben.golub@docker.com >
Upstream-commit: d453d8b3210310f12a66a64a57b2946ce93653b8
Component: engine
2014-11-05 21:48:17 +00:00
d833712ff9
Merge pull request #8874 from whoshuu/patch-1
...
Fix apparent copy paste mistake
Upstream-commit: f10fefe408d2b6b40191d802c5244ea6379954f9
Component: engine
2014-11-05 12:24:53 -08:00
07c8c2eea7
Fix vet errors
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 18d9f1978b311ff9cadce9f0237313db14502f9f
Component: engine
2014-11-05 08:26:22 -08:00
412668aa98
Bring API docs inline with 1.3
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e86223e7b3ea7766164d809d2fbd463870e0614a
Component: engine
2014-11-05 09:38:44 -05:00
92c39891ed
Removed fixme from utils_test.go
...
Signed-off-by: Blake Geno <blakegeno@gmail.com >
Upstream-commit: cbb88741e40315c5e92f2be92faedc178cf32d1c
Component: engine
2014-11-05 08:36:08 -05:00
458ef2c326
Merge pull request #8876 from whoshuu/docpatch-2
...
Remove out-of-context code block
Upstream-commit: a61c4dc959bd9370f6c6240efbeff2bf73433676
Component: engine
2014-11-05 10:52:50 +01:00
537f6ff11c
bump fpm to 1.3.2
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 03f67aa46a07024a98dd9677a3b3e73ea5da80c3
Component: engine
2014-11-05 10:12:57 +02:00
9683bcb389
Merge pull request #8577 from vbatts/vbatts-registry_certs
...
registry: don't iterate through certs
Upstream-commit: 662efd95c7a30e5593ca9fdc672ad3f1d6f9703c
Component: engine
2014-11-05 09:46:24 +02:00
e4bc9907a8
Merge pull request #8915 from gDD/patch-1
...
Remove extra line feed typo
Upstream-commit: 387c892126534a12d8dccffaed8c8a8f5f2548b8
Component: engine
2014-11-05 08:22:09 +01:00
f4fd766b12
Merge pull request #8908 from medimatrix/patch-1
...
Grammatical mistake in docs
Upstream-commit: 49ecc499d7f0898fc046cd19468a187b7d5e4d5c
Component: engine
2014-11-05 08:21:00 +01:00
b25bfe881c
unify –(en dash) to - when specifying options
...
Signed-off-by: Xie Shi <georgexsh@gmail.com >
Upstream-commit: c81337d5dbcc6a670d24f2faf9b181730fe547e4
Component: engine
2014-11-05 13:50:59 +08:00
169fd0e84d
Merge pull request #8900 from nhsiehgit/updatefooter
...
Updatefooter
Upstream-commit: 0d513b5a845f274c4ff06f6e7bc772e49167cda3
Component: engine
2014-11-04 17:14:58 -08:00
ab8d055502
Merge pull request #8345 from duglin/Issue5184
...
Add a better error message when we get an unknown http issue
Upstream-commit: b79211f4ae0f08975d02c5d51bb482f965d60a88
Component: engine
2014-11-04 20:07:41 -05:00
1a2c21becb
Add a better error message when we get an unknown http issue
...
Closes #5184
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 6fdaa66652d65558d8225d58f3ac48904ebac1de
Component: engine
2014-11-04 16:46:41 -08:00
acc213bbca
Merge pull request #8892 from fredlf/relnotes-edit
...
Edits and refinements to 1.3.1 release notes.
Upstream-commit: 098ccba6bd9d64f11690c4ef9cc61e371557316d
Component: engine
2014-11-04 16:43:07 -08:00
cf0b29ad8c
made getDefaultNetworkMtu private
...
Signed-off-by: Blake Geno <blakegeno@gmail.com >
Upstream-commit: 224999d9c21dc6d1d9aa43fb364ded09726e1d56
Component: engine
2014-11-04 18:53:34 -05:00
1b36243f30
Updated footer to match rest of site
...
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com >
Upstream-commit: ebeccee968e5edba5043920581a5b6976aa504c0
Component: engine
2014-11-04 15:28:38 -08:00
3b3d561fb2
Merge pull request #8404 from danjpgriffin/master
...
Preserve extended attributes and acls on archlinux build
Upstream-commit: c478143ec0ca8f610f7980991b9b2ba0e1160b3e
Component: engine
2014-11-04 14:14:10 -07:00
