bf4ef3faec
opts/envfile: trim all leading whitespace in a line
...
Signed-off-by: Matt Robenolt <matt@ydekproductions.com >
Upstream-commit: f1988f046f680c268e39d7b3f11374fe93c22365
Component: engine
2015-08-22 09:01:27 -07:00
7b13843714
Merge pull request #15758 from jfrazelle/EOL-fedora-20
...
fedora 20 is EOL remove from rpm builder
Upstream-commit: e6be51a0f93ce5e5213aef2c0f6329b9b3762a4a
Component: engine
2015-08-21 13:15:58 -07:00
43529eceba
Merge pull request #15746 from Microsoft/libcontainer-spec-location
...
Updated spec location for libcontainer
Upstream-commit: 1425b185dbf18ff9061a53f381ef8166aacbc8aa
Component: engine
2015-08-21 11:15:28 -07:00
24242b6544
fedora 20 is EOL remove from rpm builder
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: ee1304a35e73049221f8f2c485b5aa2684c1725f
Component: engine
2015-08-21 11:01:18 -07:00
340de9e282
Merge pull request #15748 from coolljt0725/fix_daemon_start_with_old_running_container
...
Fix docker daemon start with old running container which use thirdparty volume plugin
Upstream-commit: eb7b2ed6bbe3fbef588116d362ce595d6e35fc43
Component: engine
2015-08-21 11:07:02 -04:00
aa86f75147
Merge pull request #15754 from mountkin/fix-return
...
modify a return value in graph/tags.go to increase readability
Upstream-commit: 85bef48bf5a0c781cfa6418fa63318a94032efc7
Component: engine
2015-08-21 10:55:50 -04:00
b083881f37
Merge pull request #15751 from nf/bcw
...
Use a slice instead of a map of io.WriteClosers in broadcastwriter
Upstream-commit: 10c97a310a0ebd74c1b6b94b75391988dc6d8def
Component: engine
2015-08-21 10:51:07 -04:00
226177670d
modify a return value in graph/tags.go to increase readability
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: f11b7acc73b333eb480d2520f703f0a9c50d0a0e
Component: engine
2015-08-21 21:36:30 +08:00
b923556f4c
Use a slice instead of a map of io.WriteClosers in broadcastwriter
...
Maps rely on the keys being comparable.
Using an interface type as the map key is dangerous,
because some interface types are not comparable.
I talked about this in my "Stupid Gopher Tricks" talk:
https://talks.golang.org/2015/tricks.slide
In this case, if the user-provided writer is backed by a slice
(such as io.MultiWriter) then the code will panic at run time.
Signed-off-by: Andrew Gerrand <adg@golang.org >
Upstream-commit: 31cbf76d0c287d451182499d4fa0c4fda67e0716
Component: engine
2015-08-21 14:08:04 +01:00
6072363c3c
Merge pull request #15718 from ZJU-SEL/rm-volume-action
...
specify `docker run --rm` action when it comes to volume
Upstream-commit: 5ceff3f191ec7678362d2538aab7ed54ce17b859
Component: engine
2015-08-21 08:50:18 +02:00
0313208649
Fix docker daemon start with old running container which user volume plugin. Fixes #15720
...
Signed-off-by: Lei Jitang <leijitang@huawei>
Upstream-commit: c8a46cb0b2793bb7d742a3d221ec733d1bbaae2c
Component: engine
2015-08-21 11:29:53 +08:00
363404a258
Updated spec location for libcontainer
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
Upstream-commit: 011b4ca25607d6085dee5c247b270f48e324eb3f
Component: engine
2015-08-20 20:04:04 -07:00
042270cda3
specify the docker run --rm action
...
Signed-off-by: He Simei <hesimei@zju.edu.cn >
Upstream-commit: 76a559ccb288632ca650abe704a48581365f1ab4
Component: engine
2015-08-21 08:52:06 +08:00
781da712cd
Merge pull request #15716 from calavera/release_checklist_docs
...
Corrections in the release checklist.
Upstream-commit: d760947b2e6aff391bf93047ce6bdf96dc1d2769
Component: engine
2015-08-20 22:29:42 +01:00
ff9598bfc6
Merge pull request #15732 from moxiegirl/15731-fixes
...
Examples index has broken links
Upstream-commit: 9ed5cf08a3fc04894b141d35e96aecbed75e0cb4
Component: engine
2015-08-20 22:56:45 +02:00
cd8e412feb
Examples index has broken links
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 15c24db9a59bf2c3eb02f7a18ffd501284893ed3
Component: engine
2015-08-20 13:40:03 -07:00
c83772f751
Merge pull request #15697 from sallyom/man-commit-fix
...
fix format man-commit
Upstream-commit: ec43113662ad793d28cf4657deba6b44de61d3b9
Component: engine
2015-08-20 21:33:46 +02:00
3c892cd13a
Merge pull request #15688 from Evalle/15564-fix-windows-doc
...
Fix a windows doc issue
Upstream-commit: ba9496ae48f90ae6741c646a6a0bbd0ee9421aa9
Component: engine
2015-08-20 20:39:16 +02:00
1d21d4d6c1
Fix a windows doc issue
...
Signed-off-by: evalle <shmarnev@gmail.com >
Upstream-commit: 3c61ede074000933f2290f8765bc4cface18c0ea
Component: engine
2015-08-20 14:14:48 +02:00
9edc367ed4
Merge pull request #15696 from sallyom/man-history-fixup
...
add -H to SYNOPSIS man-history
Upstream-commit: 272a3eef9454236328b728ac43b0382142f00ecb
Component: engine
2015-08-20 22:11:50 +10:00
5057f24db0
Merge pull request #15661 from coolljt0725/fix_docker_stats_show_read_blkio
...
Fix docker stats show blkio when there are multiple block device
Upstream-commit: 44465098cb84a982547f4f7347918fce6e6bb883
Component: engine
2015-08-20 07:53:38 -04:00
7e1b5e9f5e
Corrections in the release checklist.
...
- Add a note about creating the release in GitHub.
- Fix docs release process.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1d0ee18d6be00acc5b24f54f7e3529a02f1d1222
Component: engine
2015-08-20 11:52:56 +01:00
4cc1c4efc3
Merge pull request #15715 from aanand/fix-compose-1.2-changelog-link
...
Fix Compose 1.2 changelog link
Upstream-commit: d959739125fce0da8e5ee9f121cfed08106da56b
Component: engine
2015-08-20 11:42:14 +01:00
3b6efefc4b
Merge pull request #14928 from brahmaroutu/lint_daemon_graphdriver
...
daemon/graphdriver fix lint errors/warnings
Upstream-commit: 90ebc3b455c93490c3886aaa491c7e67b7b1ec48
Component: engine
2015-08-20 03:25:00 -07:00
8569d41383
Fix Compose 1.2 changelog link
...
Hardcode the release tag, so that:
- it goes straight to the changes for 1.2, not whatever the current
version is
- it still works now that we've renamed CHANGES.md to CHANGELOG.md
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
Upstream-commit: 23d3e4bb0318b42d9a160e7f44b87382ce40840f
Component: engine
2015-08-20 11:09:10 +01:00
fc4db8ccd2
Fix docker stats show blkio when there are multiple block devices.
...
Signed-off-by: Lei Jiang <leijitang@huawei.com >
Upstream-commit: 211449a1cad317e80610e40c9d8c88df35cae60d
Component: engine
2015-08-20 11:46:21 +08:00
0491995349
Merge pull request #15707 from icaroseara/fix_typo
...
Fix typo, "fil" -> "fill"
Upstream-commit: 8acd006fd992b8fcaef3a2305ba987f3c095fe95
Component: engine
2015-08-19 21:25:43 -04:00
2132326b0b
Fix typo, "fil" -> "fill"
...
Signed-off-by: Icaro Seara <icaro.seara@gmail.com >
Upstream-commit: 997ba4b0da8c0596fd9fb108a7fcd4c79c1382ff
Component: engine
2015-08-19 21:50:54 -03:00
453680f8ee
Merge pull request #15675 from thaJeztah/carry-14625
...
[Carry #14625 ] run.md: --expose does NOT override Dockerfile EXPOSE
Upstream-commit: 41ca7c0f139502bac49554420b198c9b1667f434
Component: engine
2015-08-20 00:49:16 +02:00
1a9ed3e5c0
Add gists provided by Mary
...
This adds the example gists, provided by Mary Anthony,
also fixes a link to the old /terms/
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 35cbcc2fc1334b14a6aa9a1adf432c0ee80fd108
Component: engine
2015-08-20 00:30:39 +02:00
9faf4cef96
run.md: --expose does NOT override Dockerfile EXPOSE
...
run.md states that the operator can override all defaults set in the Dockerfile, and explicitly says that `--expose` overrides the `EXPOSE` instruction. Neither of these are true. An `EXPOSE` instruction cannot be overridden, `--expose` can only add additional exposed ports.
This change fixes the instructions, and also takes the liberty of crisping up the grammar and phrasing in a place or two.
Signed-off-by: Spencer Brown <spencer@spencerbrown.org >
Upstream-commit: 6dd84ba2ab6416a71e58ca32263c6f51a197aed0
Component: engine
2015-08-19 23:57:35 +02:00
9b9c1c02b7
Merge pull request #15682 from MHBauer/cliorder
...
add weight to daemon page so it renders in order
Upstream-commit: 286afb9a77e6851de310336c6065bd2870520414
Component: engine
2015-08-19 14:24:51 -07:00
3148f0c9e1
add weight to daemon page so it renders in order
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 2a841573521cc9d62d7b3f06143334890662cd54
Component: engine
2015-08-19 10:26:19 -07:00
6655987940
Merge pull request #15694 from liubin/fixtypo
...
add missing instruction
Upstream-commit: f848f34da222ebabc5eccf066aad3c89eeb6fd77
Component: engine
2015-08-19 19:05:41 +02:00
051aa5b9de
Merge pull request #15684 from ibuildthecloud/dont-sync
...
Don't globally lock on driver initialization
Upstream-commit: 7f46dc03d5309997361f5be6e67088ec4ac410b7
Component: engine
2015-08-19 12:48:14 -04:00
06cb17df38
Merge pull request #15664 from skatsuta/fix-parse-null
...
builder: avoid parsing null- string to nil slice (issue #15634 )
Upstream-commit: ca795765859b8560ab3d1a0ff31338d84b3c69a5
Component: engine
2015-08-19 09:06:20 -07:00
6762d7b01d
Merge pull request #15482 from hqhq/hq_fix_run_doc
...
Add format description in run doc
Upstream-commit: 7ec7173b768295a7b47270ff31ecc87d9ffbbb62
Component: engine
2015-08-19 17:13:00 +02:00
3610e48336
Merge pull request #15691 from skatsuta/fix-printf-wrong-type
...
integration-cli: fix printf verbs of wrong types
Upstream-commit: 09cdd0524efe4804c8e5b772af87afbbb8c73cb8
Component: engine
2015-08-19 08:12:45 -07:00
5918f0bba9
Merge pull request #15695 from lmesz/deviceset_warn_fix
...
deviceset.go: fixed link in warning about udex sync is not supported
Upstream-commit: 70c4b6e619003c50da82b2dedeeda67a159fe50e
Component: engine
2015-08-19 08:05:27 -07:00
68987b8336
Merge pull request #12927 from lindenlab/custom-host-port-ranges
...
Proposal: Change --publish=SPEC to allow binding to custom host port ranges
Upstream-commit: 59e49e1db0c4b59d8ca7334fdadade73755969b9
Component: engine
2015-08-19 17:04:23 +02:00
48c35e8f25
Merge pull request #15690 from hacfi/docs-status-fix
...
Small fix in dev env docs
Upstream-commit: 43763805fb609b56dcea14166e511569acf8d1da
Component: engine
2015-08-19 07:12:39 -07:00
091e1e0aee
Merge pull request #15683 from skatsuta/cli-exec-test-printf-int
...
integration-cli: modify %s to %d in formatting an int
Upstream-commit: b8c319996fae24eb9ea24b46db29005a7f0d65a6
Component: engine
2015-08-19 10:10:17 -04:00
cc1d2ef1b9
fix format man-commit
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: ab9e71b6167e636c01c7a82726f1de4e74a48607
Component: engine
2015-08-19 10:07:32 -04:00
15ace5e739
add -H to SYNOPSIS man-history
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: 898114a6d010cabdbbac77386af2d94ceabd939c
Component: engine
2015-08-19 09:35:52 -04:00
49b3bfecf2
deviceset.go: fixed link in warning about udex sync is not supported
...
Signed-off-by: Laszlo Meszaros <lacienator@gmail.com >
Upstream-commit: 78676f19c1939ad984c809ed81db665adf1576f5
Component: engine
2015-08-19 14:16:40 +02:00
1a4eeac4c4
add missing instruction
...
Signed-off-by: bin liu <liubin0329@gmail.com >
Upstream-commit: 1988064ef2abe5273fbcc8910b0177ad2b85bd54
Component: engine
2015-08-19 18:43:19 +08:00
27a001e73d
Small fix in dev env docs
...
Signed-off-by: Philipp Wahala <philipp.wahala@gmail.com >
Upstream-commit: fbc0ea32e87cb760c6402d3ded250e682c60b792
Component: engine
2015-08-19 10:53:55 +02:00
e87b5d1d77
integration-cli: fix printf verbs of wrong types
...
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp >
Upstream-commit: 5759b95e7e7c269af48a095773961ed8d13f8798
Component: engine
2015-08-19 17:47:33 +09:00
b5be5aca06
integration-cli: use c.Assert(err, check.IsNil) instead of if err != nil
...
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp >
Upstream-commit: a41f431d118291c47344b6f2599f0a8c5b272f5a
Component: engine
2015-08-19 15:23:11 +09:00
3ee024f425
Don't globally lock on driver initialization
...
This patch makes it such that plugin initialization is synchronized
based on the plugin name and not globally
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: 164208fde5f1d4bcc4d75333e3309b678edac985
Component: engine
2015-08-18 22:25:30 -07:00
