Commit Graph
17751 Commits
Author SHA1 Message Date
Soshi Katsuta 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
Jessie Frazelle 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
moxiegirl 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
moxiegirl 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
moxiegirl 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
Sebastiaan van Stijn 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
Morgan Bauer 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Mary Anthony 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
Tonis Tiigi 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
David Calavera 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
David Calavera 57a4ccd575 Merge pull request #15649 from LK4D4/syslog_validation
Syslog validation
Upstream-commit: 8aa520b8c020dd78055fbf4423ca0c086f3e4bf4
Component: engine
2015-08-18 11:14:31 -07:00
moxiegirl 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
moxiegirl 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
Brian Goff 5a9743a1e0 Merge pull request #15653 from albers/completion-log-opt-fix
[Fix 15246] bash completion fails on systems with bash 3.2
Upstream-commit: 135f5324b19b162fbfd3bbb35a031fde0e6b175d
Component: engine
2015-08-18 12:37:56 -04:00
David Calavera 692fc550c9 Merge pull request #15316 from icecrime/release_process
Documenting Docker release process
Upstream-commit: 9f1e8eea8f4645106327550da0d5e8832069461e
Component: engine
2015-08-18 09:33:44 -07:00
Sebastiaan van Stijn 2e81e96300 Merge pull request #15605 from dharmit/15530-remove-the-terms-folder
Fixing docs to remove references to links under terms/
Upstream-commit: d7ac3fa863213b2841b4af309e677df72599b39d
Component: engine
2015-08-18 18:27:28 +02:00
Sebastiaan van Stijn bcbee630ff Merge pull request #15656 from SvenDowideit/rename-public-hub
use the Docker Hub as the product name
Upstream-commit: 3ce11c1587a09cda6cd08c0bf5b8c7f7e7b14b3a
Component: engine
2015-08-18 17:59:34 +02:00
Sebastiaan van Stijn a8b12735ab Merge pull request #15657 from sallyom/man-inspect-typo
typo man-inspect
Upstream-commit: 6947fbc2b0f12b53addafb4d9aa135db3b297a69
Component: engine
2015-08-18 17:37:58 +02:00
Brian Goff e12e7dbc83 Merge pull request #15230 from azurezk/fix--rm-when-create-failure
--rm delete container when create failed
Upstream-commit: 9f8881b8102c32266e2c014cfeedd157060cc4c9
Component: engine
2015-08-18 11:32:33 -04:00
Sally O'Malley e63dc93f56 typo man-inspect
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: df11b10680f12969c5f0dc98fdee3bccf64f1f2b
Component: engine
2015-08-18 11:19:57 -04:00
Brian Goff 5ec41f4690 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>
Upstream-commit: e9d8e38c4758fdc0ebca5b54cdc1ba253cbbd438
Component: engine
2015-08-18 10:01:52 -04:00
Sally O'Malley 98681bccab fix SYNOPSIS alphabetical order man-create
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 8b8413266c303ad5b11e3458784a393417979036
Component: engine
2015-08-18 08:16:57 -04:00
Sven Dowideit d138731095 use the Docker Hub as the product name
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 30cde97e5c9a35d47dd666e461c0ce83f2f69581
Component: engine
2015-08-18 21:13:57 +10:00
Harald Albers 84b06479b0 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>
Upstream-commit: 18381faee685c6d28dd7438a183bf7a441e8c9a1
Component: engine
2015-08-18 09:17:29 +02:00
Kai Blin 7ca1dac319 reference/run: Some editorial changes
Based on the suggestions from @moxiegirl, some changes to make the wording more clear.

Signed-off-by: Kai Blin <kai@samba.org>
Upstream-commit: ba29d31c9cb205863d8d63542ef969e7c6fafcfe
Component: engine
2015-08-18 08:56:56 +02:00
Zhang Kun a3521c2e7e fix in daemon side
Signed-off-by: Zhang Kun <zkazure@gmail.com>

goformat

Signed-off-by: Zhang Kun <zkazure@gmail.com>

fix small

Signed-off-by: Zhang Kun <zkazure@gmail.com>

change to rm

Signed-off-by: Zhang Kun <zkazure@gmail.com>

handler other error

Signed-off-by: Zhang Kun <zkazure@gmail.com>

unique ERR

Signed-off-by: Zhang Kun <zkazure@gmail.com>

setHostConfig_fail_test

Signed-off-by: Zhang Kun <zkazure@gmail.com>

format

Signed-off-by: Zhang Kun <zkazure@gmail.com>

err handle and modify test

Signed-off-by: Zhang Kun <zkazure@gmail.com>

golint error

Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: 1ed15550f57ae822bb30263ce81174cabeb794ec
Component: engine
2015-08-18 10:06:36 +08:00
moxiegirl 427a3b4bda Merge pull request #15613 from mgrauer/update_docs_installation_mac_docker_machine_name
Update dev machine name to default in mac installation docs
Upstream-commit: 66112a7ae5313aff70ed5aebc2ed9d9ba2265d85
Component: engine
2015-08-17 19:05:34 -07:00
Alexandre Beslic a2576f3ffa Merge pull request #15380 from calavera/remove_sys_info_pointers
Remove pointers from the SysInfo struct.
Upstream-commit: f1da5edc8b1404a302b02d38a60bba91c4bcd965
Component: engine
2015-08-17 18:40:54 -07:00
moxiegirl dd213d0178 Merge pull request #15430 from charleswhchan/patch-2
Cleanup "Working with containers" page.
Upstream-commit: 5ab6883b9228a960052a0812b8529614937c66d3
Component: engine
2015-08-17 17:46:05 -07:00
Brian Goff 7a8e3f26ae Merge pull request #15650 from LK4D4/fix_max_file_error
Fix error message in max-file validation
Upstream-commit: fd2e945d155e7506ece7f3ada867b06a2eff7656
Component: engine
2015-08-17 20:27:12 -04:00
Brian Goff 39fa3c5eb8 Merge pull request #15632 from mountkin/fix-15626
a quick fix to #15626
Upstream-commit: 1c916dbd8359beb9db14f2688879977db86b2c1d
Component: engine
2015-08-17 20:26:47 -04:00
Doug Davis f00550c0b6 Merge pull request #15599 from calavera/ps_format_q
Fix ignore `-q` flag in `docker ps` when there is a default format.
Upstream-commit: 29ced5d0c4d67b3609c95bc039589009086852b3
Component: engine
2015-08-17 15:44:28 -07:00
Alexander Morozov 3107abf81b Fix error message in max-file validation
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: cde607108badc84ddb6a7e2d2f75ce31be9967a5
Component: engine
2015-08-17 15:34:39 -07:00
Alexander Morozov 8deea878c7 Fix LogConfig.Config in inspect
Also add test for daemon-wide log-opt.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3f61002b05794eb5e4262a39e29f8a45c7260ba3
Component: engine
2015-08-17 15:27:44 -07:00
Alexander Morozov 03328caba1 Check syslog config on daemon start
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 960791ba60621ef2b182379e7b237e681b602694
Component: engine
2015-08-17 14:29:45 -07:00
Brian Goff 5bfc44e34c Merge pull request #15292 from mountkin/fix-exec-test
move the assertions outside of the goroutine
Upstream-commit: 5c88a6fdcaa264845e5ad07f57222f750e213520
Component: engine
2015-08-17 17:24:58 -04:00
Alexander Morozov acbee0eb90 Do not allow corrupted syslog-address
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: b7a6d14bdc56e9397be8c9bef9c3d991ff30fe77
Component: engine
2015-08-17 14:19:06 -07:00
Alexander Morozov 40dd394833 Merge pull request #15611 from mariussturm/master
Initialize LogConfig in daemon mode
Upstream-commit: aef15ffc5da5d872476c068f7820f196b5a027ea
Component: engine
2015-08-17 14:17:54 -07:00
David Calavera ff003f32f9 Merge pull request #15356 from Microsoft/10662-uncpathonbuild
Windows: Allow UNC paths on build
Upstream-commit: 436fca704f7cf14b85d1b9324033a1a778d75134
Component: engine
2015-08-17 13:34:27 -07:00
John Howard f3a123c54b Windows: Allow UNC paths on build
Signed-off-by: John Howard <jhoward@microsoft.com>
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: df7ab6f3dbec85c1cf32b36c4c7dcfdc374f6566
Component: engine
2015-08-17 11:03:54 -07:00
Alexander Morozov c19232ca91 Merge pull request #15635 from cpuguy83/15633_allow_logconfig_empty_driver
Fix `inspect` output when no log driver specified
Upstream-commit: 5aeb48af7702be78774c36cfabbda1b3bf1c7b34
Component: engine
2015-08-17 11:03:37 -07:00
David Calavera 4c6bab5f50 Fix ignore -q flag in docker ps when there is a default format.
Docker ps default format should not take precedence over cli flags.
This happens effectively for other flags except `-q`.
We need to let the cli to set the format as table to print the
expected output with `-q`.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: df46bfdd4d28dcab432b2fc6c36131ff95223148
Component: engine
2015-08-17 10:48:04 -07:00
David Calavera d9d9dff9a7 Merge pull request #15579 from Microsoft/10662-graph
Windows: Graph remove custom interface, add central store
Upstream-commit: 2e7b088164960b7981a058f34336c05dc52f2c53
Component: engine
2015-08-17 10:45:48 -07:00
Brian Goff f403372672 Fix inspect output when no log driver specified
Config options were being ignored in the inspect output when no driver
was specified.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2f2779b6a5c8f6efcd2ba55bf7cb0db54c259726
Component: engine
2015-08-17 11:35:34 -04:00
Shijiang Wei e353ad2a0e a quick fix to #15626
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 3977f30869fad2c679d7913ce968add7c7987282
Component: engine
2015-08-17 21:35:57 +08:00
Sebastiaan van Stijn 63ab074ee2 Merge pull request #15237 from charleswhchan/patch-3
Reformat /containers/(id)/resize to make it consistent with other sections.
Upstream-commit: bba762b19254b8315aa8d5a6a63cb00253eaa42c
Component: engine
2015-08-16 10:59:16 +02:00
Charles Chan 5ba2c88bd5 Reformat /containers/(id)/resize to make it consistent with "Exec Resize" section.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 6cd2d8946902eddab5e3902efeef3c7ffd748a1e
Component: engine
2015-08-15 19:47:01 -07:00
Sebastiaan van Stijn f2f5327a6e Merge pull request #14113 from dit4c/10348-exec-privileged
Remerge of `docker exec --privileged` with better tests
Upstream-commit: e1f3a5ad0aade527c1b00385652aec21d1cf09ac
Component: engine
2015-08-16 00:20:41 +02:00