docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-26 15:41:42 +03:00
Code Activity
8,091 Commits 12 Branches 297 Tags
371479ab9fb02e303ac3c929e1d9b08049b0345a
Commit Graph

7457 Commits

Author SHA1 Message Date
Solomon Hykes
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
Solomon Hykes
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
Solomon Hykes
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
Solomon Hykes
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
Solomon Hykes
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
Solomon Hykes
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
Victor Vieux
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
Jérôme Petazzoni
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
Victor Vieux
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
Max Shytikov
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
James Turnbull
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
James Turnbull
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
O.S.Tezer
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
James Turnbull
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
James Turnbull
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
unclejack
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
Solomon Hykes
92a6d709bd Merge pull request #5561 from bmurphy1976/bmurphy1976-table-tests 
Upstream-commit: a6b7e94696558134757fe3b7dcd912db37668f69
Component: engine
 2014-05-09 00:00:19 -07:00
Solomon Hykes
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
Benjamin Atkin
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
Michael Crosby
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
O.S. Tezer
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
Victor Vieux
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
Alexander Larsson
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
Michael Crosby
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
Tony Daws
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
Mason Malone
960115467c Fix link to daemon/execdriver/lxc/lxc_template.go 
Upstream-commit: 5d39175c22b01cb31ebabb0c52de913a5541cd8b
Component: engine
 2014-05-08 12:49:50 -04:00
Michael Crosby
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
Alexander Larsson
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
O.S. Tezer
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
Tianon Gravi
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
Bryan Murphy
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
Michael Crosby
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
Michael Crosby
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
Guillaume J. Charmes
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
Lars R. Damerow
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
Victor Vieux
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
Victor Vieux
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
Michael Crosby
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
Michael Crosby
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
Michael Crosby
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
LK4D4
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
Tianon Gravi
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
Jonathan McCrohan
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
Ryan Aslett
b4dfa516c6 The Go template is a better pattern for documentation. 
Upstream-commit: 7549199cc5e1de910f5dbd539831095739524ea6
Component: engine
 2014-05-07 00:21:02 -07:00
Sven Dowideit
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
Michael Crosby
1e327c2bc7 Set container pid for process in native driver 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 62e8ddb5791b9ee62c3f4361084dda4a5d7760e1
Component: engine
 2014-05-06 17:04:04 -07:00
Sven Dowideit
9f2043420a update the docs to reflect the nice \n handling 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: cfb232cff27da2dd46ec04a5bf6699ab1d1df91c
Component: engine
 2014-05-07 09:40:49 +10:00
Victor Vieux
fdccd2aaa1 improve some usages 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b622da3cfe211d31df69e72a93ed4fae872aca65
Component: engine
 2014-05-06 21:32:12 +00:00
Victor Vieux
29bfaa0d20 use tabwriter to display usage in mflag 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 77098d5b5bf8840a1179380b34aedb26139b9d65
Component: engine
 2014-05-06 21:31:21 +00:00
Sven Dowideit
49adbc4838 Merge pull request #5622 from SvenDowideit/net-host-docs 
Update the run --net cli help to include the 'host' option
Upstream-commit: d7166536e7f71ca87a8c37d2eb1c06184c9f3bd6
Component: engine
 2014-05-07 07:11:41 +10:00