Commit Graph

7472 Commits

Author SHA1 Message Date
8c86f99ef3 Cleaned up Network settings overview
Upstream-commit: feb42d3f97f3a4de9317f17297c6277fcb0cc2af
Component: engine
2014-05-12 20:35:18 +02:00
0e45fa5891 Merge pull request #5729 from fabiofalci/link_unlink_test
Integration test for link and unlink containers
Upstream-commit: 4c065069942fd17cf074ffd312677dae5ba43fc2
Component: engine
2014-05-12 21:06:03 +03:00
7a283742d2 Integration test for link and unlink containers
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 7cc27b2075d6293ab2f54a7255fcb1b1e062fd91
Component: engine
2014-05-11 21:33:01 +01:00
4b636334e3 Remove signal_freebsd (already in pkg/signal)
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 3f8ffb461ab66535b3c3a96a564c06db12a27281
Component: engine
2014-05-11 01:03:12 -07:00
8cb5d72505 Merge pull request #5621 from ostezer/docs-add-pardot
Add code for Pardot implementation to docs
Upstream-commit: 27a39bfd1a45e94e3935f9b57db2c072db27ce2c
Component: engine
2014-05-12 09:18:12 -07:00
5a665531c0 Merge pull request #5731 from SvenDowideit/reduce-cache-max-age
reduce cache time to 1 hours so future docs releases update the cloudfront caches faster
Upstream-commit: 0f88dbd7447f0c21853549c2a496cd1601678795
Component: engine
2014-05-12 17:05:55 +01:00
a0faa3873c reduce cache time to 1 hours so future docs releases update the cloudfront caches faster
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 1dec8fd03c4f9c99491d3019f56772cccaf100fd
Component: engine
2014-05-12 11:31:44 +10:00
57c8245b81 Give the Redirect a HostName - filled in from the s3 bucket name.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 0d59cc080a8dc115bdb727d376e3965e58109718
Component: engine
2014-05-12 10:31:27 +10:00
ee7f537ba7 Merge pull request #5716 from shykes/pr_out_engine_receiver_and_sender_preserve_job_env
Upstream-commit: 5877ae24624ccca38b5d54a187db6951cce10d78
Component: engine
2014-05-09 19:47:32 -07:00
fcaf06384b Merge pull request #5432 from shykes/image-subsystem-1
Upstream-commit: 4dc16ab54613a75865c06296e7155e03e9b30a63
Component: engine
2014-05-09 19:19:33 -07:00
910a692b37 Start separating the image subsystem
This is a first step towards moving all code related to local
manipulation of images into a cleanly separated subsystem,
accessible via a stable set of commands in the engine API.

`graph.TagStore` now implements `engine.Installer`. For now, it
is installed by `Server.InitServer`, along with all other Server
commands. However this will change in future patches.

`graph.TagStore.Install` registers the following commands:

* `image_set` creates a new image and stores it locally.
* `image_get` returns information about an image stored locally.
* `image_tag` assigns a new name and tag to an existing image.

These commands are a pre-requisite for moving 'push' and 'pull'
out of `Server`.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: ff4ef504708bfaa51d4d361455689a21a031cc35
Component: engine
2014-05-09 19:15:26 -07:00
fafa044284 Merge pull request #5635 from vbatts/vbatts-registry_maintainers
Upstream-commit: d6e666a87a01a5634c250358a94c814bf26cb778
Component: engine
2014-05-09 19:07:25 -07:00
69200e5e03 Engine: Receiver and Sender preserve Job.Env
When sending a new job to a `engine.Sender`, the corresponding
`engine.Receiver` will receive that job with its environment preserved.
Previously the job name, arguments and streams were preserved but the
env was lost.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: a1754c7e46b321c2a079fc5186984a847aa50218
Component: engine
2014-05-09 17:10:33 -07:00
371479ab9f Engine: Env.MultiMap, Env.InitMultiMap: import/export to other formats
* `Env.MultiMap` returns the contents of an Env as `map[string][]string`
* `Env.InitMultiMap` initializes the contents of an Env from a `map[string][]string`

This makes it easier to import and export an Env to other formats
(specifically `beam/data` messages)

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: c7978c98097b92b659e2ea1763cd134b0695407e
Component: engine
2014-05-09 17:06:32 -07:00
b701571f37 beam/data: Message.GetOne() returns the last value set at a key
This is a convenience for callers which are only interested in one value
per key. Similar to how HTTP headers allow multiple keys per value, but
are often used to store and retrieve only one value.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 2af030ab57d1d84ac9a1d22552dc9d83b16951c4
Component: engine
2014-05-09 17:01:27 -07:00
9cb18397df Engine: ensure all pipes are properly closed by Receiver and Sender
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)

[michael@docker.com: fix stdin closing in engine.Job.Run]
[michael@docker.com: fix fd leak in engine.Receiver.Run]
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)

Docker-Tested-By: Solomon Hykes <solomon@docker.com>
Docker-Tested-by: Michael Crosby <michael@docker.com>
Upstream-commit: d61190169de27bc58f1fe4a8f49b37bd2294d489
Component: engine
2014-05-09 16:12:21 -07:00
1b604a326b Engine: slightly more stress-testing of Receiver/Sender to reproduce the hang problem
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: bf25951837440286fb185f97f7c9cfda11962cab
Component: engine
2014-05-09 15:49:44 -07:00
4cfcc681e6 Engine: fix a timeout bug in Sender/Receiver
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: dfdc03b061d5bd5a7557f077b500304d4da26d2e
Component: engine
2014-05-09 15:49:44 -07:00
c3352a3b6c Fix stdin handling in engine.Sender and engine.Receiver
This introduces a superficial change to the Beam API:

* `beam.SendPipe` is renamed to the more accurate `beam.SendRPipe`
* `beam.SendWPipe` is introduced as a mirror to `SendRPipe`

There is no other change in the beam API.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 0aeff69e5900a15e3872494ac0009600f6c1c372
Component: engine
2014-05-09 15:39:55 -07:00
fb89461e49 returns an error when using -h and --net
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 2899195540857f2ad7c50ea509847c3a598c5e81
Component: engine
2014-05-09 21:42:22 +00:00
e0f7bd3420 Merge pull request #5463 from tianon/hack-dind-cgroup
Update hack/dind to mount cgroups on "/cgroup" instead of "/sys/fs/cgroup" for better compatibility
Upstream-commit: 29f1efc94040df21aaf6e932fc797a1113ab03cb
Component: engine
2014-05-09 13:54:52 -07: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
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
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
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
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
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
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