3c61ede074
Fix a windows doc issue
...
Signed-off-by: evalle <shmarnev@gmail.com>
2015-08-20 14:14:48 +02:00
272a3eef94
Merge pull request #15696 from sallyom/man-history-fixup
...
add -H to SYNOPSIS man-history
2015-08-20 22:11:50 +10:00
44465098cb
Merge pull request #15661 from coolljt0725/fix_docker_stats_show_read_blkio
...
Fix docker stats show blkio when there are multiple block device
2015-08-20 07:53:38 -04:00
1d0ee18d6b
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>
2015-08-20 11:52:56 +01:00
d959739125
Merge pull request #15715 from aanand/fix-compose-1.2-changelog-link
...
Fix Compose 1.2 changelog link
2015-08-20 11:42:14 +01:00
90ebc3b455
Merge pull request #14928 from brahmaroutu/lint_daemon_graphdriver
...
daemon/graphdriver fix lint errors/warnings
2015-08-20 03:25:00 -07:00
23d3e4bb03
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>
2015-08-20 11:09:10 +01:00
6b8129d1fe
added check for bind on create to determine local volume driver
...
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com>
2015-08-20 01:40:04 -07:00
211449a1ca
Fix docker stats show blkio when there are multiple block devices.
...
Signed-off-by: Lei Jiang <leijitang@huawei.com>
2015-08-20 11:46:21 +08:00
a6ed990593
daemon/state: separate part of SetRestarting to setRestarting
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-08-20 11:14:28 +08:00
8acd006fd9
Merge pull request #15707 from icaroseara/fix_typo
...
Fix typo, "fil" -> "fill"
2015-08-19 21:25:43 -04:00
997ba4b0da
Fix typo, "fil" -> "fill"
...
Signed-off-by: Icaro Seara <icaro.seara@gmail.com>
2015-08-19 21:50:54 -03:00
41ca7c0f13
Merge pull request #15675 from thaJeztah/carry-14625
...
[Carry #14625 ] run.md: --expose does NOT override Dockerfile EXPOSE
2015-08-20 00:49:16 +02:00
35cbcc2fc1
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>
2015-08-20 00:30:39 +02:00
6dd84ba2ab
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>
2015-08-19 23:57:35 +02:00
286afb9a77
Merge pull request #15682 from MHBauer/cliorder
...
add weight to daemon page so it renders in order
2015-08-19 14:24:51 -07:00
2a84157352
add weight to daemon page so it renders in order
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-08-19 10:26:19 -07:00
f848f34da2
Merge pull request #15694 from liubin/fixtypo
...
add missing instruction
2015-08-19 19:05:41 +02:00
7f46dc03d5
Merge pull request #15684 from ibuildthecloud/dont-sync
...
Don't globally lock on driver initialization
2015-08-19 12:48:14 -04:00
457aeaa2e1
Modify test to include /dev/shm sharing
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-08-19 12:36:57 -04:00
d88fe447df
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)
2015-08-19 12:36:52 -04:00
ca79576585
Merge pull request #15664 from skatsuta/fix-parse-null
...
builder: avoid parsing null- string to nil slice (issue #15634 )
2015-08-19 09:06:20 -07:00
b6f1b4ad35
Add support for kernel memory limit
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-08-19 23:56:55 +08:00
87959dbfac
Add CheckKernelVersion so we can check any specific version
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-08-19 23:49:52 +08:00
7ec7173b76
Merge pull request #15482 from hqhq/hq_fix_run_doc
...
Add format description in run doc
2015-08-19 17:13:00 +02:00
09cdd0524e
Merge pull request #15691 from skatsuta/fix-printf-wrong-type
...
integration-cli: fix printf verbs of wrong types
2015-08-19 08:12:45 -07:00
70c4b6e619
Merge pull request #15695 from lmesz/deviceset_warn_fix
...
deviceset.go: fixed link in warning about udex sync is not supported
2015-08-19 08:05:27 -07:00
59e49e1db0
Merge pull request #12927 from lindenlab/custom-host-port-ranges
...
Proposal: Change --publish=SPEC to allow binding to custom host port ranges
2015-08-19 17:04:23 +02:00
43763805fb
Merge pull request #15690 from hacfi/docs-status-fix
...
Small fix in dev env docs
2015-08-19 07:12:39 -07:00
b8c319996f
Merge pull request #15683 from skatsuta/cli-exec-test-printf-int
...
integration-cli: modify %s to %d in formatting an int
2015-08-19 10:10:17 -04:00
ab9e71b616
fix format man-commit
...
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-08-19 10:07:32 -04:00
898114a6d0
add -H to SYNOPSIS man-history
...
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-08-19 09:35:52 -04:00
78676f19c1
deviceset.go: fixed link in warning about udex sync is not supported
...
Signed-off-by: Laszlo Meszaros <lacienator@gmail.com>
2015-08-19 14:16:40 +02:00
1988064ef2
add missing instruction
...
Signed-off-by: bin liu <liubin0329@gmail.com>
2015-08-19 18:43:19 +08:00
fbc0ea32e8
Small fix in dev env docs
...
Signed-off-by: Philipp Wahala <philipp.wahala@gmail.com>
2015-08-19 10:53:55 +02:00
5759b95e7e
integration-cli: fix printf verbs of wrong types
...
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
2015-08-19 17:47:33 +09:00
cbb69531a8
Add CONFIG_BLK_DEV_THROTTLING to check-config.sh
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-19 15:11:04 +08:00
a41f431d11
integration-cli: use c.Assert(err, check.IsNil) instead of if err != nil
...
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
2015-08-19 15:23:11 +09:00
164208fde5
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>
2015-08-18 22:25:30 -07:00
3dc30d47e1
Merge pull request #15417 from icecrime/update_windows_registry_endpoint
...
Update Windows TP3 registry endpoints
2015-08-18 20:35:02 -07:00
5b870d7fa6
integration-cli: modify %s to %d in formatting an int
...
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
2015-08-19 12:06:05 +09:00
d45fcc6c80
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>
2015-08-19 11:11:46 +09:00
2a468ed7e4
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>
2015-08-19 10:11:08 +08:00
aacb47d628
Merge pull request #15671 from tonistiigi/fix-volume-userguide
...
Update volumes userguide
2015-08-18 18:57:24 -07:00
5fccbd1243
Merge pull request #15676 from thaJeztah/fix-anchor-link
...
docs: fix anchor link on Ubuntu installation page Merging for @thaJeztah ....da ddadad dadada 🎼
2015-08-18 18:55:56 -07:00
9f1e324b53
Merge pull request #15660 from sallyom/man-create-typo
...
fix SYNOPSIS alphabetical order man-create
2015-08-18 18:40:39 -07:00
d997351e97
Merge pull request #15677 from moxiegirl/carry-14714-changes
...
remove references to 'source repository'
2015-08-19 00:56:41 +02:00
b143c05d64
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>
2015-08-18 15:50:42 -07:00
5dd28c1f9d
docs: fix anchor link on Ubuntu installation page
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-08-18 23:41:00 +02:00
7e3088c43b
Merge pull request #15672 from moxiegirl/cli-reference-cleanup
...
Updating hashcode links to commands
2015-08-18 21:45:06 +02:00
evalle
Sven Dowideit
Brian Goff
David Calavera
Doug Davis
Aanand Prasad
Clinton Kitson
Lei Jitang
Ma Shimiao
Icaro Seara
Sebastiaan van Stijn
Sebastiaan van Stijn
Spencer Brown
moxiegirl
Morgan Bauer
Mrunal Patel
Qiang Huang
Phil Estes
Sally O'Malley
Laszlo Meszaros
bin liu
Philipp Wahala
Soshi Katsuta
Darren Shepherd
Jessie Frazelle