Commit Graph

20092 Commits

Author SHA1 Message Date
Doug Davis
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
Qiang Huang
b6f1b4ad35 Add support for kernel memory limit
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-08-19 23:56:55 +08:00
Qiang Huang
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
Sebastiaan van Stijn
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
Doug Davis
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
Phil Estes
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
Sebastiaan van Stijn
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
moxiegirl
43763805fb Merge pull request #15690 from hacfi/docs-status-fix
Small fix in dev env docs
2015-08-19 07:12:39 -07:00
Brian Goff
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
Sally O'Malley
ab9e71b616 fix format man-commit
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-08-19 10:07:32 -04:00
Sally O'Malley
898114a6d0 add -H to SYNOPSIS man-history
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-08-19 09:35:52 -04:00
Laszlo Meszaros
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
bin liu
1988064ef2 add missing instruction
Signed-off-by: bin liu <liubin0329@gmail.com>
2015-08-19 18:43:19 +08:00
Philipp Wahala
fbc0ea32e8 Small fix in dev env docs
Signed-off-by: Philipp Wahala <philipp.wahala@gmail.com>
2015-08-19 10:53:55 +02:00
Soshi Katsuta
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
Lei Jitang
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
Soshi Katsuta
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
Darren Shepherd
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
Jessie Frazelle
3dc30d47e1 Merge pull request #15417 from icecrime/update_windows_registry_endpoint
Update Windows TP3 registry endpoints
2015-08-18 20:35:02 -07:00
Soshi Katsuta
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
Soshi Katsuta
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
Qiang Huang
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
moxiegirl
aacb47d628 Merge pull request #15671 from tonistiigi/fix-volume-userguide
Update volumes userguide
2015-08-18 18:57:24 -07:00
moxiegirl
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
moxiegirl
9f1e324b53 Merge pull request #15660 from sallyom/man-create-typo
fix SYNOPSIS alphabetical order man-create
2015-08-18 18:40:39 -07:00
Sebastiaan van Stijn
d997351e97 Merge pull request #15677 from moxiegirl/carry-14714-changes
remove references to 'source repository'
2015-08-19 00:56:41 +02:00
Morgan Bauer
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
7e3088c43b Merge pull request #15672 from moxiegirl/cli-reference-cleanup
Updating hashcode links to commands
2015-08-18 21:45:06 +02:00
Mary Anthony
85c2c77188 Updating hashcode links to commands
Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-18 12:25:59 -07:00
Tonis Tiigi
cc2aab7816 Update volumes userguide
Fixes #15644

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-08-18 12:17:45 -07:00
David Calavera
215a1136f7 Merge pull request #15662 from cpuguy83/noisy_blkio_warning
Quiet sysinfo warnings on container create/start
2015-08-18 11:47:17 -07:00
Tonis Tiigi
10305dc5e8 Add unless-stopped restart policy
Fixes #11008

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-08-18 11:39:06 -07:00
Vincent Demeester
799d9605d6 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>
2015-08-18 20:36:08 +02:00
David Calavera
8aa520b8c0 Merge pull request #15649 from LK4D4/syslog_validation
Syslog validation
2015-08-18 11:14:31 -07:00
moxiegirl
bba2551847 Merge pull request #15510 from kblin/issue-14795
reference/run: Clarify the use of numeric UIDs
2015-08-18 09:43:16 -07:00
moxiegirl
7ae6a505f2 Merge pull request #15337 from phemmer/doc-builder-volume
add documentation clarifying behavior of VOLUME instruction
2015-08-18 09:42:00 -07:00
Tonis Tiigi
8eeafa058c Fix pull on client disconnect
Fixes #15589

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-08-18 09:41:37 -07:00
Brian Goff
135f5324b1 Merge pull request #15653 from albers/completion-log-opt-fix
[Fix 15246] bash completion fails on systems with bash 3.2
2015-08-18 12:37:56 -04:00
David Calavera
9f1e8eea8f Merge pull request #15316 from icecrime/release_process
Documenting Docker release process
2015-08-18 09:33:44 -07:00
Sebastiaan van Stijn
d7ac3fa863 Merge pull request #15605 from dharmit/15530-remove-the-terms-folder
Fixing docs to remove references to links under terms/
2015-08-18 18:27:28 +02:00
Sebastiaan van Stijn
3ce11c1587 Merge pull request #15656 from SvenDowideit/rename-public-hub
use the Docker Hub as the product name
2015-08-18 17:59:34 +02:00
Sebastiaan van Stijn
6947fbc2b0 Merge pull request #15657 from sallyom/man-inspect-typo
typo man-inspect
2015-08-18 17:37:58 +02:00
Brian Goff
9f8881b810 Merge pull request #15230 from azurezk/fix--rm-when-create-failure
--rm delete container when create failed
2015-08-18 11:32:33 -04:00
Sally O'Malley
df11b10680 typo man-inspect
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-08-18 11:19:57 -04:00
Brian Goff
e9d8e38c47 Quiet sysinfo warnings on container create/start
This was making logrus warn on each container create and start.
These warnings are not needed as the code below already warns when these
various cgroup settings aren't supported but have been set.
Warnings were originally introduced by #15381, which appear to be a
side-effect of that change and not the intention.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-08-18 10:01:52 -04:00
Sally O'Malley
8b8413266c fix SYNOPSIS alphabetical order man-create
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-08-18 08:16:57 -04:00
Soshi Katsuta
2d6952e8a5 builder: avoid decoding "null" string in ADD, COPY and VOLUME step to nil slice
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
2015-08-18 21:15:57 +09:00
Sven Dowideit
30cde97e5c use the Docker Hub as the product name
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-08-18 21:13:57 +10:00
Harald Albers
18381faee6 Fix bash completion for log driver options
This option was incorrectly ported to the new `daemon` subcommand
structure.

Beside the obvious effect that completion of `docker daemon --log-opt`
did not work, this also caused completion of `docker` and `docker xxx`
to fail on macs with

> bash: words: bad array subscript

Signed-off-by: Harald Albers <github@albersweb.de>
2015-08-18 09:17:29 +02:00