Commit Graph
11903 Commits
Author SHA1 Message Date
Richard Metzler ea8fa13170 Empty Line should fix Markdown unordered list
Without the line break the list would render as one single paragraph.
Upstream-commit: 91a8b916b09615119e80a1193f1a2f6c01143106
Component: engine
2014-11-23 23:57:43 +01:00
Dmitry V. Krivenok 9509d05af6 Fixed typo in documentation.
Upstream-commit: 745e3f77a127c5be2e7d563e402e3e4a7d5d7729
Component: engine
2014-11-23 22:59:35 +03:00
Vincent Bernat b226fef09a zsh: correctly parse available subcommands
A lot of flags have been added on the output of `docker help`. Use a
more robust method to extract the list of available subcommands by
spotting the `Command:` line and the next blank line.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 34fe2a372576907cb7ec26cf22ac4e93b8974f6e
Component: engine
2014-11-23 00:45:14 +01:00
Doug Davis 5dbc13abb8 Add missing unit testcase for new IsSet() func in mflag
Forgot to add this when I did PR #9259

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 88afbc4d94c4a803e936d602c620b8ab08e24acd
Component: engine
2014-11-22 05:37:36 -08:00
James Mills 300940db18 Updated installation docs for CRUX as a Docker Host.
Docker-DCO-1.1-Signed-off-by: James Mills <prologic@shortcircuit.net.au> (github: therealprologic)
Upstream-commit: 30979ad5a0f94097e7dc6763c26fc33dc716d572
Component: engine
2014-11-22 17:18:11 +10:00
Jessie Frazelle 8bf9a8d42c Merge pull request #9223 from vbatts/vbatts-overlay_notfound
overlayfs: more helpful output when not supported
Upstream-commit: c59b308b6b2fc8112a93d64f4922b0ece01a4e6a
Component: engine
2014-11-21 19:58:01 -08:00
Mike Snitzer b28ed4ddea devmapper: remove unnecessary else branch in getPoolName()
Docker-DCO-1.1-Signed-off-by: Mike Snitzer <snitzer@redhat.com> (github: snitm)
Upstream-commit: 553b50bd37ade60bfafe5d5cc10f984251741f44
Component: engine
2014-11-21 21:36:23 -05:00
Brian Goff 1f85619ac6 Cleanup exec API docs and available params
Adds pertitent information about what is expected in the json payload
and comments out unsupported (exec) features in runConfig.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d4ba00bd4237ebf6e8016a350d95cc060e5e8a05
Component: engine
2014-11-21 21:11:07 -05:00
Jessie Frazelle 17175863b2 Merge pull request #9188 from somaopensource/8777-fix
Fix for #8777 (continuing PR #9061)
Upstream-commit: d7626e97b61f5f8f5d585ec82d6154395a3f9404
Component: engine
2014-11-21 17:57:56 -08:00
Vincent Batts e029685ee4 pkg/devicemapper: clarify TaskCreate and createTask
* Rename and expose createTask() to TaskCreateNamed()
* add comments

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: acdf766069f8e8c65fd3de3ce4f8efc15f421abd
Component: engine
2014-11-21 20:54:50 -05:00
Michael Crosby 5f6e6e9df3 Merge pull request #9183 from vbatts/dm_udevwait
devmapper: Call UdevWait() even in failure path
Upstream-commit: fb1540199e2a7fb8aaf7918a9a35d1f21adeaad5
Component: engine
2014-11-21 17:28:37 -08:00
Vincent Batts 354971bf12 Merge pull request #9267 from crosbymichael/devmapper-mknod
Mknod more loopbacks for devmapper
Upstream-commit: 104d27a07b78f1a029e60b69a4488132982ae12e
Component: engine
2014-11-21 20:23:43 -05:00
Michael Crosby 664428ef8f Merge pull request #9086 from vbatts/vbatts-tarsum_more_tests
pkg/tarsum: adding more tests
Upstream-commit: e820365b677cff6a5f3b073da1a3ebb21e5f8247
Component: engine
2014-11-21 17:12:55 -08:00
Michael Crosby 5e63676399 Merge pull request #9185 from djmaze/patch-1
Fix link to MAINTAINERS.md in CONTRIBUTING.md
Upstream-commit: 496db275d540d754774d4e2867bdcb666464af20
Component: engine
2014-11-21 16:40:27 -08:00
Michael Crosby 0c37aeb40b Mknod more loopbacks for devmapper
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f8509e7940d73ecc0071faf15a865acb1f8dad52
Component: engine
2014-11-21 16:20:35 -08:00
Martin Honermeyer c20c704755 Fix link to MAINTAINERS.md in CONTRIBUTING.md
Signed-off-by: Martin Honermeyer <maze@strahlungsfrei.de>
Upstream-commit: 20218f39718673d3ae5822aeecfd08ea0c6e8126
Component: engine
2014-11-22 01:18:40 +01:00
unclejack d66b329d87 Merge pull request #9270 from jfrazelle/8919-tag-output
Output image with tag name when image is not found
Upstream-commit: 07b7bdb4fcd97efee02d9eb3c19ada7f54d60c25
Component: engine
2014-11-22 01:56:31 +02:00
Michael Crosby 21eb3ab253 Merge pull request #9265 from vieux/daemon_labels
add daemon labels (displayed in docker info)
Upstream-commit: c78bf8d86a912adafa0c2514e9224431a887b197
Component: engine
2014-11-21 15:14:27 -08:00
Tibor Vass 8aeb562625 Merge pull request #9158 from tianon/minor-makefile-preamble-reorg
Add some minor reorganization to the Makefile preamble
Upstream-commit: 17ba356e9a291e5d128d8b6f6c4a8f2b9f1f1778
Component: engine
2014-11-21 18:02:11 -05:00
Tianon Gravi 7eeacf5615 Add some minor reorganization to the Makefile preamble
The gist here is a reemphasizing of the explicitly "user mutable" bits by putting them first (and hopefully improving readability a little bit in the process).

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 82f33d86a7c4d41d3c880757d35c81c847a9ab69
Component: engine
2014-11-21 15:49:09 -07:00
Sven Dowideit 50546730f2 Merge pull request #9209 from SvenDowideit/shared-disk-space-images
If an image has more than one repo name or tag, it'll be listed more tha...
Upstream-commit: 44159f38d2b6d92e21b7c4b43bfd9ba7dce3719e
Component: engine
2014-11-21 14:07:45 -08:00
Vincent Batts 95c96f42c9 Merge pull request #9149 from swagiaal/fix-configureBridge-comment
Remove reference to 'ifaceName' from configureBridge comment.
Upstream-commit: a43ee077dca75d0e8f198275db17eac341b0ca8c
Component: engine
2014-11-21 16:37:28 -05:00
Vincent Batts 6951abbd89 Merge pull request #9009 from a-ba/fix-export-repo
fix missing layers when exporting a full repository 
Upstream-commit: a5277764aed9e5493387a6f4caf2bb93a0a6afa3
Component: engine
2014-11-21 15:44:27 -05:00
Victor Vieux eec853d8c5 key=values -> key=value
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 62a7d75512d939a86cbc58986278548df3302902
Component: engine
2014-11-21 19:15:22 +00:00
unclejack 19f9fcbc25 build: add pull flag to force image pulling
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 054e57a622e6a065c343806e7334920d17a03c5b
Component: engine
2014-11-21 19:59:44 +02:00
Alexander Morozov 8d3c39cea7 Merge pull request #9261 from unclejack/fix_test_tmp_cleanup
fix cleanup of /tmp in tests
Upstream-commit: 0f2de5158fe66b4906de176f90e3e6d813336450
Component: engine
2014-11-21 08:48:04 -08:00
Arnaud Porterie f702226e49 Merge pull request #9225 from icecrime/win_make_binary
Adapt project/make.sh for Windows builds
Upstream-commit: ce8ebaf0e013fd4a7f6e04b36d0a2c57a19aeef9
Component: engine
2014-11-21 08:37:19 -08:00
unclejack 2388eefc7e graphdriver/aufs: fix tmp cleanup in tests
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 4180579313e84ea7e3d85214521a815e95459a90
Component: engine
2014-11-21 18:31:45 +02:00
Yohei Ueda 5192262c8e Use termios via CGO
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>
Upstream-commit: 244af451e9bdff5c87bca84e4c15193fc9eebc64
Component: engine
2014-11-21 22:12:03 +09:00
Joel Friedly 995880b42a Fix typos in the user guide main page
Signed-off-by: Joel Friedly <joelfriedly@gmail.com>
Upstream-commit: 2d2b3535cae11d02573d12297d34e9a98a3e984a
Component: engine
2014-11-21 03:17:00 +00:00
Alexander Morozov 8e044d3796 Merge pull request #9271 from jfrazelle/iptables-errors
Typed errors for iptables chain raw command output. YAYYYYYY.
Upstream-commit: e3f3259e006e955d2a280d9f37451b5813657b4a
Component: engine
2014-11-20 19:03:38 -08:00
Jessica Frazelle c878d4a442 Apply same typed iptables errors to network driver.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: f6c7194539720473aae814d3d1445eab2a78d568
Component: engine
2014-11-20 18:07:15 -08:00
Jessica Frazelle cbc7790607 Typed errors for iptables chain raw command output. YAYYYYYY.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 6cc75574b3b01fa4dfeeef585e52dbcf8da28586
Component: engine
2014-11-20 18:07:11 -08:00
Michael Crosby b4f3f7d0fc Merge pull request #9259 from duglin/Issue9221
Make --tlsverify enable tls regardless of value specified
Upstream-commit: 532e502e9c37d1caab59f9e8d188f6700b197ebb
Component: engine
2014-11-20 17:41:31 -08:00
Michael Crosby 3d66822e1d Merge pull request #9248 from vbatts/vbatts-fix_gh9241
pkg/tarsum: actually init the TarSum struct
Upstream-commit: 5d67a3faea400273e4307db7990a51fc2d2ca0dc
Component: engine
2014-11-20 17:15:15 -08:00
Jeff Anderson b38288b6f1 refer to the registry instead of the hub
Signed-off-by: Jeff Anderson <jeff@docker.com>
Upstream-commit: 7b20c1fd1877dc91abfbf6fd57e1f16e3b44c1e0
Component: engine
2014-11-20 16:54:46 -08:00
unclejack 73a99e1a72 Merge pull request #9269 from crosbymichael/update-libcontainer-nov20
Update libcontainer to 84c1636580a356db88b079d118b94abe6a1a0acd
Upstream-commit: 5cde77d003892fa20f82f9bf586c7623494d6cbf
Component: engine
2014-11-21 02:50:04 +02:00
Doug Davis f7e2fcdfb9 Make --tlsverify enable tls regardless of value specified
I also needed to add a mflag.IsSet() function that allows you to check
to see if a certain flag was actually specified on the cmd line.

Per #9221 - also tweaked the docs to fix a typo.

Closes #9221

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: ae9bd580af55992974fcb94f73f72cc3b2257fec
Component: engine
2014-11-20 16:09:06 -08:00
Fred Lifton ed1ade4c80 Merge pull request #9220 from SvenDowideit/add-apache-foreground-eg
Add an example that shows starting apache in the foreground
Upstream-commit: 29f4ea2cd5ee0988abb24264e4dbf01fa52d2d54
Component: engine
2014-11-20 16:02:38 -08:00
Michael Crosby 271208f1aa Merge pull request #9228 from SvenDowideit/update-tlsverify-doc
tlsverify flag has no dash
Upstream-commit: c1a40d927999a7e019f1952c2b140ef6e4a76171
Component: engine
2014-11-20 15:19:31 -08:00
Jessica Frazelle 0e1ef24503 Fix tag output where image is not found.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: e527be1f14eda5a3d9077517a0398d85c4d7fac6
Component: engine
2014-11-20 15:09:09 -08:00
Lei Jitang 49be3bdeb0 Fix create container output messages.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 7a7890950d59abf7bc4f826c605289e1d7586390
Component: engine
2014-11-20 15:03:27 -08:00
Michael Crosby 0f9991ec4d Revert "Support hairpin NAT"
This reverts commit 95a400e6e1a3b5da68431e64f9902a3fac218360.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 56c37536315d4c63c35b766e3335034e488e2189
Component: engine
2014-11-20 14:22:32 -08:00
Sven Dowideit 17282d5feb Add an example that shows starting apache in the foreground
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 8d3b13bd7a14aa41eb3d3f3aab1b974af1db4a50
Component: engine
2014-11-20 14:21:05 -08:00
Michael Crosby b0f41baab2 Merge pull request #9260 from LK4D4/increase_proxy_timeout
Increase timeout for userland proxy starting
Upstream-commit: 4acdb7ddc7f10cd707d02ca88317056e988b2abb
Component: engine
2014-11-20 14:20:31 -08:00
Michael Crosby 2a4e189795 Update libcontainer to 84c1636580a356db88b079d118b
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f42176434aa874afb7d633064f2babcf9d5124ab
Component: engine
2014-11-20 14:19:24 -08:00
Michael Crosby e22789790c Merge pull request #9174 from dqminh/docker-exec-env
Set correct env variables for `docker exec` commands
Upstream-commit: 9a917e732c8f84f365b36a5a92bdb1f546a7e4d1
Component: engine
2014-11-20 13:31:51 -08:00
Michael Crosby f435c304cd Merge pull request #8251 from duglin/Issue2333
Add support for ENV of the form: ENV name=value ...
Upstream-commit: 58b6f31a7a3157b5ece418da0a976a28dae9841d
Component: engine
2014-11-20 13:12:24 -08:00
Victor Vieux a8399407af docs nits
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 284cbda9ceb368d4bb67c0c75739984622570d92
Component: engine
2014-11-20 19:54:03 +00:00
Victor Vieux f6afb58177 events filtering
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 7ff3b81054b028a4399c86340489fe3937049abe
Component: engine
2014-11-20 19:46:48 +00:00