Commit Graph

8080 Commits

Author SHA1 Message Date
3712225f95 fix event removal
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 670564d07096c190011bf7adf74afe4d61ef9720
Component: engine
2014-05-09 22:12:54 +00:00
1e0b101a68 Merge pull request #5686 from crosbymichael/cast-to-closer
Cast Input and Output to io.Closer
Upstream-commit: 0f6fe22833213cc09ffc39f9584dcd3ce10ac9fa
Component: engine
2014-05-09 11:17:53 -07:00
78a30f94a5 Merge pull request #5697 from mshytikov/fix/doc
Added value format description for VOLUME instruction in builder doc
Upstream-commit: d4c774de9759a174a3b77664663f9fd4ee43016d
Component: engine
2014-05-09 17:14:27 +01:00
c589c9a2f3 Added value format description for VOLUME instruction
In the documentation was not mentioned explicitly that VOLUME value
shoud be a valid JSON array. Because of this I spent time to discovering
the problem with my image where I put `VOLUME ['/data']` (with single quotes).
The `['/data']` mount point was parsed and mounted whole as a string without
any errors and warnings.

Docker-DCO-1.1-Signed-off-by: Max Shytikov <mshytikov@gmail.com> (github: mshytikov)
Upstream-commit: b5a37127aadbefea937346846116cb93966798dd
Component: engine
2014-05-09 16:37:55 +02:00
b432390cfc Merge pull request #5583 from ostezer/docs-ui-add-codeblock-scrolling
Introduce x-axe scrolling to code-blocks.
Upstream-commit: 79dc316a86402882faffd88128ee56633e3eccc9
Component: engine
2014-05-09 10:31:52 +02:00
63756f9b02 Merge pull request #5599 from ostezer/docs-rewrite-examples-mongodb
Rewrite and update the MongoDB service article
Upstream-commit: 12201e2ea34148276bd7cf287e6171c0a40b5aff
Component: engine
2014-05-09 10:25:37 +02:00
719c55d2d0 Rewrite and update the MongoDB service article
MongoDB article had some fundemental issues.

 - Outdated Dockerfile
 - Insufficient / unclear instructions
 - Unnecessary comments
 - Failed to explain the role of Docker.io
 - Did not have a complete Dockerfile sample
 - Lacked a "learn more" section / link to Trusted Builds

This update aims to address all these issues with a complete re-write.

It also:

 - Corrects the label under which this article is/was listed on the menu

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)

 - First run at amending after the initial review process.
 - Make the Dockerfile generic.
 - Revision.
 - Fixes
Upstream-commit: fd5672349490f9cd18933a2508e1890c9e026af5
Component: engine
2014-05-09 09:09:52 +01:00
ae9f35caf2 Merge pull request #5678 from MasonM/patch-2
Fix link to daemon/execdriver/lxc/lxc_template.go
Upstream-commit: 2463849ecf2bc9812a4be4bbb10855c489ae9a65
Component: engine
2014-05-09 09:41:47 +02:00
ac129f9512 Merge pull request #5689 from benatkin/doc-osx-setup-section-fix
make higher level heading specify that instructions are for manual installation
Upstream-commit: 80b750be5d7225eb997cd661b1330652084c25db
Component: engine
2014-05-09 09:35:24 +02:00
f0b524c32c Merge pull request #5540 from unclejack/imports_cleanup
Upstream-commit: d2a41b38c52a679b997f889b46a460231b983e81
Component: engine
2014-05-09 00:30:14 -07:00
90fcda8544 rename goruntime import to runtime
This renames the goruntime import of the runtime package back to
runtime.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 4c2b9d732446adb472667c2a7017ba3e8cc58c0d
Component: engine
2014-05-09 10:14:37 +03:00
92a6d709bd Merge pull request #5561 from bmurphy1976/bmurphy1976-table-tests
Upstream-commit: a6b7e94696558134757fe3b7dcd912db37668f69
Component: engine
2014-05-09 00:00:19 -07:00
626d91d1bd Merge pull request #5116 from LK4D4/chown_only_on_content_#5110
Upstream-commit: 1736b025eac26f107fbb8502e276c215d8e86336
Component: engine
2014-05-08 23:16:22 -07:00
3b9e92a12c make higher level heading specify that instructions are for manual install
Docker-DCO-1.1-Signed-off-by: Benjamin Atkin <ben@benatkin.com> (github: benatkin)
Upstream-commit: ca33d2589f69381719b456352fdaaaa3fe54d5ac
Component: engine
2014-05-08 22:57:04 -07:00
0d11cb3ece Cast Input and Output to closer
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 170e4d2e19258c4e45b975177618640cb554c32b
Component: engine
2014-05-08 12:57:19 -07:00
3a9d1a8f79 Merge pull request #5679 from tdaws/master
Fixed typo in docs - intro - working with docker - working with images. ...
Upstream-commit: f5309a2a090a1c8c0e22d9634f5c4d0cf92f03dc
Component: engine
2014-05-08 20:15:54 +01:00
85637088fc Merge pull request #5680 from alexlarsson/dm-remove-spew
devmapper: Remove accidental debug spew
Upstream-commit: 8d3c5b7dcaf5fb0e7084adac969bfbe75f3bbaeb
Component: engine
2014-05-08 10:32:11 -07:00
49a93b84ed devmapper: Remove accidental debug spew
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: bff0c4f3dc560109ed2d5dc6cae12453c9bc2747
Component: engine
2014-05-08 19:25:47 +02:00
0e12d2d077 Merge pull request #5673 from tianon/kcore-error
Update restrict.Restrict to both show the error message when failing to mount /dev/null over /proc/kcore, and to ignore "not exists" errors while doing so (for when CONFIG_PROC_KCORE=n in the kernel)
Upstream-commit: 7673e3c58938aa4179f3ec84ed4960b4b6267c14
Component: engine
2014-05-08 10:20:19 -07:00
ff4347f669 Fixed typo in docs - intro - working with docker - working with images. It read that you can use both images used by others and images used by others, in a run-on sentence.
Upstream-commit: ea049a2ebc072819920c42140221ce4ab7bab22e
Component: engine
2014-05-08 10:05:00 -07:00
960115467c Fix link to daemon/execdriver/lxc/lxc_template.go
Upstream-commit: 5d39175c22b01cb31ebabb0c52de913a5541cd8b
Component: engine
2014-05-08 12:49:50 -04:00
891da1c12d Merge pull request #5535 from vmarmol/add-maintainers-cgroup
Adding Rohit Jnagal and Victor Marmol to pkg/cgroups maintainers.
Upstream-commit: 718154b3b6db33a77fb05829d29abcebb77beb86
Component: engine
2014-05-08 09:48:31 -07:00
63b4ebccb3 Merge pull request #5404 from alexlarsson/dm-new-metadata
Make devicemapper backend able to support multiple processes
Upstream-commit: 3a1703a79f6702c67ce51ea58f359d1d63bb0c6f
Component: engine
2014-05-08 14:31:17 +02:00
a4a413f833 Merge pull request #5659 from ryanaslett/master
Trivial Documentation Change: The Go template is a better pattern for documentation.
Upstream-commit: e4f4ce83d2646030cbe9e7dec41b567596b4c236
Component: engine
2014-05-08 10:59:35 +01:00
71620ac1c0 Update restrict.Restrict to both show the error message when failing to mount /dev/null over /proc/kcore, and to ignore "not exists" errors while doing so (for when CONFIG_PROC_KCORE=n in the kernel)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: d60301edb88a4e182a10cd2becb3795b2dd13fab
Component: engine
2014-05-08 01:03:45 -06:00
e6d82972c8 move Table to a separate file and add additional unit tests
Docker-DCO-1.1-Signed-off-by: Bryan Murphy <bmurphy1976@gmail.com> (github: bmurphy1976)
Upstream-commit: fdccfaf72a614872aeeb79e9cee7f42abcaacf6d
Component: engine
2014-05-08 02:31:23 +00:00
40ac51bff0 Merge pull request #5671 from crosbymichael/merge_release_v0.11.1
Merge release v0.11.1
Upstream-commit: 81041b3ba696250b9da719875d6c41312c4cc046
Component: engine
2014-05-07 18:51:29 -07:00
de6ae5d92c Change version to v0.11.1-dev
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 0ed9bba1ee48ff925ade710658fecd2270f8a223
Component: engine
2014-05-07 18:48:38 -07:00
040805bfec Merge branch 'release' into merge_release_v0.11.1
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 093aacb740c81a5c96a2300e6b2afae442879915
Component: engine
2014-05-07 18:47:47 -07:00
ea54561d1f Merge pull request #5668 from crosbymichael/bump_v0.11.1
Bump to version v0.11.1
Upstream-commit: 5f3d6b8e7f4ba3e572f89321753066541d17fbc1
Component: engine
2014-05-07 18:47:46 -07:00
8b1acbeb39 Bump to version v0.11.1
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: fb99f992c081a1d433c97c99ffb46d12693eeb76
Component: engine
2014-05-07 17:29:56 -07:00
f41a1fe05f Merge branch 'master' into bump_v0.11.1
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 6640f46f0ea718a173504018d79248d58f2d2dc1
Component: engine
2014-05-07 17:27:57 -07:00
4e4fbfd51e Merge pull request #5667 from bitness/typo-fix
Fix error name typo (ErrInvalidWorikingDirectory)
Upstream-commit: ed00ba84acfaefe9d2dd67dd5b186842990e049a
Component: engine
2014-05-07 16:53:08 -07:00
b0da971da8 Merge pull request #5665 from vieux/fix_auth_issue
Fix auth issue
Upstream-commit: c7712b350a51a2727c170d89b3e7ecc7cf70c90d
Component: engine
2014-05-07 16:36:07 -07:00
35bec1ebab Fix error name typo (ErrInvalidWorikingDirectory)
Docker-DCO-1.1-Signed-off-by: Lars R. Damerow <lars@grandstreet.us> (github: bitness)
Upstream-commit: d3150e0927043976b0b88bd61e50dc1e456fa77b
Component: engine
2014-05-07 16:28:51 -07:00
fda92cf483 Revert "refactor build job to know only configFile"
This reverts commit b9731bccf2b2cc8c06ef8bdb41f72ca4791e63db.

Conflicts:
	server/server.go

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 2aff119baa15cff37f9b2004755f144f16a87801
Component: engine
2014-05-07 22:59:13 +00:00
f18c414a67 Revert "rename configFile to auth in the job"
This reverts commit e9c3e397436221528312c0d3b291ae5a12862ed2.

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 331e77f9ed938b3a8c7346ef46a9f6f5cd2dc794
Component: engine
2014-05-07 22:58:09 +00:00
f9dae65842 Merge pull request #5660 from crosbymichael/merge_release_v0.11.0
Merge release to master v0.11.0
Upstream-commit: 93f5d539fed58a28853e3b4840a6de6ded236cf4
Component: engine
2014-05-07 11:42:49 -07:00
883ab8d68e Change version to v0.11.0-dev
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 1ed63f1d16669dc2ce7eb75f3d56ea8a5c27ab39
Component: engine
2014-05-07 11:38:02 -07:00
9e81c975fd Merge branch 'release' into merge_release_v0.11.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: b68e0078c218ef1d8f993da668582e8ac0cb630b
Component: engine
2014-05-07 11:37:32 -07:00
484a4cc7b9 Merge pull request #5640 from crosbymichael/bump_v0.11.0
Bump version to v0.11.0
Upstream-commit: 57aa2f2ef4d1ae82cbd62e09c0c290c51aa01d52
Component: engine
2014-05-07 11:35:20 -07:00
87fbcf8816 Bump version to v0.11.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 15209c380c3f510e3f8d5ba1ff5fcc5cc8db3357
Component: engine
2014-05-07 09:59:55 -07:00
1f5f83d095 Change owner only on copied content
Fixes #5110
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 91b7d8ebd31dba64b551de85e70786c568cb402a
Component: engine
2014-05-07 20:40:22 +04:00
15b50925f1 Merge pull request #5642 from jmccrohan/master
Update mkimage-debootstrap "ubuntuLatestLTS" to "trusty"
Upstream-commit: ddd0470ed1487f1b12286f3213e1d8e98021509d
Component: engine
2014-05-07 09:45:22 -06:00
d7be599a05 mkimage-debootstrap: set ubuntuLatestLTS as Trusty
Ubuntu 14.04 LTS (Trusty Tahr) was released on Thu, 17 Apr 2014; Update
ubuntuLatestLTS accordingly.

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
Upstream-commit: 9e64a4d862e38ead4c2708ce61663f176844406b
Component: engine
2014-05-07 08:26:24 +01:00
b4dfa516c6 The Go template is a better pattern for documentation.
Upstream-commit: 7549199cc5e1de910f5dbd539831095739524ea6
Component: engine
2014-05-07 00:21:02 -07:00
e2dc002b85 Merge pull request #5634 from vieux/improve_mflag_usage
Add support for \n in usages
Upstream-commit: bd9b27fe18e92f4fb9123d2f254b16818911f11a
Component: engine
2014-05-07 13:53:04 +10:00
a4be23f31a Merge pull request #4 from SvenDowideit/improve_mflag_usage_docs
update the docs for the new \n rendering
Upstream-commit: 275faf06e8e59ccf448c8e99a6c4c4a93ee59da1
Component: engine
2014-05-06 19:54:47 -07:00
bf609b3ea4 Merge branch 'master' into bump_v0.11.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 263d134fff83f90eed5b706d8ddb39e7e36efe32
Component: engine
2014-05-06 18:03:23 -07:00
3893d734fc Merge pull request #5643 from crosbymichael/fix-native-pid
Set container pid for process in native driver
Upstream-commit: 41b2874b99fa308b23bd9984b28f2c89f69ebd14
Component: engine
2014-05-06 18:02:55 -07:00