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
d4c05ed20e
Allow branch name in vendor-helper script
...
With this, you can specify a branch name in the
vendor script instead of a commit ID. This makes it easier
to quickly test changes in dep'd repos outside of the DIND
environment.
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: 6bf24406505476cf1ba1c844a57cc84ef8122359
Component: engine
2015-08-19 17:56:04 -05: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
83fa43c4c9
Modify test to include /dev/shm sharing
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: 457aeaa2e1bdbb75c5b3bcedacde460920965c2f
Component: engine
2015-08-19 12:36:57 -04:00
58ef88608a
Add support for sharing /dev/shm/ and /dev/mqueue between containers
...
This changeset creates /dev/shm and /dev/mqueue mounts for each container under
/var/lib/containers/<id>/ and bind mounts them into the container. When --ipc:container<id/name>
is used, then the /dev/shm and /dev/mqueue of the ipc container are used instead of creating
new ones for the container.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: d88fe447df0e87b3a57f9d08b108b141dd72678c
Component: engine
2015-08-19 12:36:52 -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
3004521c7f
Add support for kernel memory limit
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: b6f1b4ad350cbf1f540797eee44520694237d47c
Component: engine
2015-08-19 23:56:55 +08:00
815901c7f0
Add CheckKernelVersion so we can check any specific version
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 87959dbfac6827afa10a78c4635acddebfd5fc8e
Component: engine
2015-08-19 23:49:52 +08: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
6e390a2d96
Add CONFIG_BLK_DEV_THROTTLING to check-config.sh
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: cbb69531a8f3f2da55956aabf85d4581cbc511d2
Component: engine
2015-08-19 15:11:04 +08: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
ccb1fbf0e4
Merge pull request #15417 from icecrime/update_windows_registry_endpoint
...
Update Windows TP3 registry endpoints
Upstream-commit: 3dc30d47e196b19a364eed46ecfdde8550f1b9f6
Component: engine
2015-08-18 20:35:02 -07:00
8e9c7e7df9
integration-cli: modify %s to %d in formatting an int
...
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp >
Upstream-commit: 5b870d7fa6d65895a4be601a1e09812a4962d03d
Component: engine
2015-08-19 12:06:05 +09:00
a9c24d4837
integration-cli: add a integration test to avoid parsing null string in ADD, COPY and VOLUME to nil slice
...
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp >
Upstream-commit: d45fcc6c80bd67ee6a06821fd64cad029d3a756f
Component: engine
2015-08-19 11:11:46 +09:00
1edea74db3
Add format description in run doc
...
And only set false to --oom-kill-disable, we just need the default
value to show.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 2a468ed7e409f785a51969b48f0d34a4e0d88413
Component: engine
2015-08-19 10:11:08 +08:00
87cbf1e8d4
Merge pull request #15671 from tonistiigi/fix-volume-userguide
...
Update volumes userguide
Upstream-commit: aacb47d628930273308187a0b2389e8f8cb0c63f
Component: engine
2015-08-18 18:57:24 -07:00
51012044ae
Merge pull request #15676 from thaJeztah/fix-anchor-link
...
docs: fix anchor link on Ubuntu installation page Merging for @thaJeztah ....da ddadad dadada 🎼
Upstream-commit: 5fccbd124308a099a0e5ea76addcab5c0a7a952f
Component: engine
2015-08-18 18:55:56 -07:00
17775654ce
Merge pull request #15660 from sallyom/man-create-typo
...
fix SYNOPSIS alphabetical order man-create
Upstream-commit: 9f1e324b53a1f278f5c3090fbb0fa80fdb2521da
Component: engine
2015-08-18 18:40:39 -07:00
9a351ffd01
Merge pull request #15677 from moxiegirl/carry-14714-changes
...
remove references to 'source repository'
Upstream-commit: d997351e97fdf8f32b03b5ae57ad684c70052a10
Component: engine
2015-08-19 00:56:41 +02:00
717cb5744e
remove references to 'source repository'
...
- rewrite intro to Dockerfile reference usage section to remove
references to 'source repository'
- Closes #14714
- Fixes: #8648
- Updating with Seb's comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: b143c05d64c4532b090d1f718ab93b4f7b1c466c
Component: engine
2015-08-18 15:50:42 -07:00
84dd1a53ef
docs: fix anchor link on Ubuntu installation page
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5dd28c1f9d5933c81c24c9d5fd478239438437f1
Component: engine
2015-08-18 23:41:00 +02:00
a1647767a5
Merge pull request #15672 from moxiegirl/cli-reference-cleanup
...
Updating hashcode links to commands
Upstream-commit: 7e3088c43b6a4cbee988607d1503c0f8066966bb
Component: engine
2015-08-18 21:45:06 +02:00
fdd77b46c5
Updating hashcode links to commands
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 85c2c771884aaa73b65753bdbdf31d596cd90111
Component: engine
2015-08-18 12:25:59 -07:00
c643d6fd66
Update volumes userguide
...
Fixes #15644
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: cc2aab7816f555f58ef3ccaed16537989ac683a7
Component: engine
2015-08-18 12:17:45 -07:00
2415190b1c
Merge pull request #15662 from cpuguy83/noisy_blkio_warning
...
Quiet sysinfo warnings on container create/start
Upstream-commit: 215a1136f7a65a68a2b2999bdb00d05758882073
Component: engine
2015-08-18 11:47:17 -07:00
2bf42179ec
Add unless-stopped restart policy
...
Fixes #11008
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 10305dc5e8cc7e2e1560ce2abe93c17e923a1c47
Component: engine
2015-08-18 11:39:06 -07:00
22da8315f6
Remove/Comment time.Sleep in integration tests
...
Remove what seems unnecessary time.Sleep (1 second even) and comment the
ones that seemed necessary.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 799d9605d6d37a0f5c559b0325d924ad183ff4ee
Component: engine
2015-08-18 20:36:08 +02:00
57a4ccd575
Merge pull request #15649 from LK4D4/syslog_validation
...
Syslog validation
Upstream-commit: 8aa520b8c020dd78055fbf4423ca0c086f3e4bf4
Component: engine
2015-08-18 11:14:31 -07:00
f01d1eb72b
Merge pull request #15510 from kblin/issue-14795
...
reference/run: Clarify the use of numeric UIDs
Upstream-commit: bba2551847835a42fba43ed0d461c58bb2ad963b
Component: engine
2015-08-18 09:43:16 -07:00
68b94ae6c4
Merge pull request #15337 from phemmer/doc-builder-volume
...
add documentation clarifying behavior of VOLUME instruction
Upstream-commit: 7ae6a505f21237f30e862e0a6a24da711558bc29
Component: engine
2015-08-18 09:42:00 -07:00
2a748ae2e6
Fix pull on client disconnect
...
Fixes #15589
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 8eeafa058c762b303436422a4682c364fe469985
Component: engine
2015-08-18 09:41:37 -07:00
