da795b0534
Merge pull request #15953 from duglin/DaemonContext
...
Add a "context" to the api/server/* code
Upstream-commit: 6efe45990d7d50940b8c070be7b45b7a7399d327
Component: engine
2015-09-09 17:28:38 -07:00
b09dc49663
Merge pull request #15495 from samuelkarp/awslogs-logging-driver
...
Add awslogs driver for Amazon CloudWatch Logs
Upstream-commit: 9f517fc5bb95758d66a0c9d48ae9ece202352948
Component: engine
2015-09-09 17:19:39 -07:00
4eee792b71
Merge pull request #16023 from mikebrow/12854-update-irc-webpage
...
refresh where to chat page; and add IRCCloud to IRC Quickstart
Upstream-commit: 8855bf350026a27a6615fa057d176b28715d77d5
Component: engine
2015-09-09 17:14:28 -07:00
0199cb8013
Merge pull request #16188 from albers/docs-volume-help
...
Update docs and man pages for `docker volume` subcommands
Upstream-commit: b154a6f68eb289125117d8be5bcefaa508e79dca
Component: engine
2015-09-09 17:13:21 -07:00
dbaa3ef518
Merge pull request #16192 from anusha-ragunathan/dev
...
Updated rpm spec to perform cleaner installs
Upstream-commit: 72f355e466447f1bee4f9cc8bcab98f8b1560396
Component: engine
2015-09-09 15:26:36 -07:00
9ec0a0380f
Move context stuff to its own package
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: f790496d8bd0930d7b1bc4adf120ae5ef169a958
Component: engine
2015-09-09 14:23:25 -07:00
f022abdae0
Updated rpm spec to perform cleaner installs
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 1caa9a7d162be26e2560481b917d1592f724316c
Component: engine
2015-09-09 17:13:57 -04:00
56082f8faa
Add awslogs driver for Amazon CloudWatch Logs
...
Signed-off-by: Samuel Karp <skarp@amazon.com >
Upstream-commit: 3effe484e6f572298d0c3490517f57391617aa51
Component: engine
2015-09-09 13:52:40 -07:00
84efd65be4
Vendor AWS Go SDK
...
Signed-off-by: Samuel Karp <skarp@amazon.com >
Upstream-commit: 85433365cc4e16a50e29aacb8de5872c64496d4f
Component: engine
2015-09-09 13:51:14 -07:00
5e00b6c763
Merge pull request #14626 from kunalkushwaha/add-network-cli-help
...
"docker network" missing from docker --help
Upstream-commit: a796ac53185c2827017843fec21e02aba88f6ace
Component: engine
2015-09-09 13:36:43 -07:00
5f65695cc8
addressing useability comments per @moxiegirl
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com >
Upstream-commit: 82fce531031d9974013390ead67456d39fb070e9
Component: engine
2015-09-09 14:59:30 -05:00
8f5d65caff
Add a "context" to the api/server/* code
...
This defines a 'context' object that is passed to each API handler.
Right now the context just has a unique 'requestID' for each API call.
The next steps would be:
- use this 'requestID' in our logging.
- determine the best way to format the logging to include this info.
In particular for log events that generate multiple entries in the log
we can use the requestID to help correlate the log entries.
Adding the requestID to the logging will be a challenge since it could mean
changing every single logrus.XXX() call to pass in the 'context' object.
But first step is to agree on a format, which we can discus in a subsequent
PR, but my initial thoughts are to add it right after the timestamp:
current format:
INFO[0039] POST /v1.21/build?buildargs=%7B%22foo%22%3A%22xxx%22%7D&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=Dockerfile&memory=0&memswap=0&rm=1&t=&ulimits=null
proposed format:
INFO[0039-83dea1222191] POST /v1.21/build?buildargs=%7B%22foo%22%3A%22xxx%22%7D&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=Dockerfile&memory=0&memswap=0&rm=1&t=&ulimits=null
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 8b454dd79e6a11c3c881f8a755423713c0491287
Component: engine
2015-09-09 12:51:20 -07:00
6eaf153c54
Merge pull request #16154 from calavera/remove_steve_from_maintainers
...
Remove Steve Francia from maintainers.
Upstream-commit: 5ff63b6946cf47055d507d83c7a4730d4e44c598
Component: engine
2015-09-09 12:38:59 -07:00
3e720579c6
Merge pull request #16162 from cpuguy83/16071_fix_lstat_errors
...
Ignore stat errors on volume rm.
Upstream-commit: d3338494598c6d25153cd3e97a0a783ccd4e06d5
Component: engine
2015-09-09 11:55:14 -07:00
e36e8005d6
Merge pull request #16171 from vdemeester/lint-only-on-diff
...
Golint only on changed files
Upstream-commit: 00728964453d893dd739bd17d7954324d42b5073
Component: engine
2015-09-09 10:19:16 -07:00
e51216d417
Merge pull request #16185 from runcom/fix-pkg-devicemapper-typo
...
pkg: devicemapper: fix typo in function declaration
Upstream-commit: 5d67fd5fb2f88d3f7098f6e17851d9be5cb38daa
Component: engine
2015-09-09 10:17:52 -07:00
fb110ef322
update docker volume man pages
...
- added --help option
- fixed several formatting problems
Also added --help to volume inspect reference page.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 2724010364e6d7d316a244ae37850e8c91abb87c
Component: engine
2015-09-09 19:16:39 +02:00
dbc44ea4a3
Merge pull request #16149 from LK4D4/remove_link_libs
...
Remove -lpthread and -ldl from ldflags
Upstream-commit: 3d8aae13083458d87cc42882fa7c7ce681d620d2
Component: engine
2015-09-09 10:13:36 -07:00
fd8752d0f5
Merge pull request #16179 from hristozov/patch-1
...
Update the time since Linux 2.6.26 in the security article
Upstream-commit: 34752e091d9e49be096a4aa207f83c28bc87ae3e
Component: engine
2015-09-09 18:33:50 +02:00
2126535e6d
pkg: devicemapper: fix typo in function declaration
...
6990b76a696dd265674f4c2973f25755a6485f05 introduced a typo in function
declaration, this patch fixes that.
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: d4a123b20b4f8fb1858f3cf411b3695353c0a973
Component: engine
2015-09-09 15:57:52 +02:00
7b6e69864b
We don't need image layer stream when create the rootfs
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: f70c592137833cae83e4ba05f760465200829975
Component: engine
2015-09-09 20:31:08 +08:00
a20201d130
Merge pull request #16177 from HuKeping/leading-tab
...
Use TrimSpace to instead of Trim
Upstream-commit: 104d30f946c068ef9a4449dca937782be5454d19
Component: engine
2015-09-09 14:12:36 +02:00
8f57866c62
Linux 2.6.26 is now 7 years ago :)
...
Signed-off-by: Georgi Hristozov <georgi@forkbomb.nl >
Upstream-commit: e514fabfac00798449bc07c5cdb419fd04a9c684
Component: engine
2015-09-09 15:06:02 +03:00
f8286ea2a0
Merge pull request #16176 from HuKeping/typo
...
Kind of typo
Upstream-commit: 8ff67b9c1aa5b681c4c1e985d5c70356a3a9c99c
Component: engine
2015-09-09 07:37:37 -04:00
b744bb23c3
Use TrimSpace to instead of Trim
...
String.Trim(string, " ") can only get ride of the blank, but actully we need
to remove all leading and trailing white space include "\t" for example.
Prior to this patch, one can login with "[Tab][Tab]username", and it will
not be consider as the same with "username".
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: e9602f3561b78313c4d474a8d950f7cc562637e8
Component: engine
2015-09-09 19:37:33 +08:00
e87532e652
Kind of typo
...
It seems the author foget to change the variable name after copying
from the valid testcase.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: fd5c33194ca6ff0851925bf1efe386a5375362a5
Component: engine
2015-09-09 19:03:53 +08:00
61d8a97de5
Golint only on changed files
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 1cca5ee98c3a2e2a2bf7e4e79d9f0a95fef7d169
Component: engine
2015-09-09 09:37:47 +02:00
762165daa3
Minor formating changes
...
- Changed ";" to "." at the end of bullet points for consistency
Signed-off-by: Artur Meyster <arthurfbi@yahoo.com >
Upstream-commit: f8308a496565a85eb01100e5645e54f80ba76c83
Component: engine
2015-09-09 00:21:22 -07:00
787635e646
Added periods at the end of bullet points for consistency
...
Signed-off-by: Artur Meyster <arthurfbi@yahoo.com >
Upstream-commit: 2022fa81fff0d9dc49045743e82a5838f82f8bb8
Component: engine
2015-09-08 23:17:10 -07:00
154c412ece
Merge pull request #15798 from calavera/volume_driver_host_config
...
Move VolumeDriver to HostConfig to make containers portable.
Upstream-commit: 9ca4aa479788867cd2dce161efa1e43ea5dfc14f
Component: engine
2015-09-08 22:05:40 -04:00
52da61961a
Ignore stat errors on volume rm.
...
Underlying volume data may have been removed by some other tool.
Ignore and remove the reference in this case.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 8d27417bfeff316346d00c07a456b0e1b056e788
Component: engine
2015-09-08 22:01:02 -04:00
5f33863cc9
Merge pull request #16157 from runcom/add-missing-err-check-integration-cli-run
...
integration-cli: add missing err check
Upstream-commit: a58aa9d8899c55d328fbfcdd8f61dd72b738fa52
Component: engine
2015-09-08 17:26:10 -07:00
48de342ac9
Remove -lpthread and -ldl from ldflags
...
There is no need in those flags now when we use amalgamated sqlite3 from
mattn/go-sqlite3.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 8845eb434596ea709a7ef066d191141331dd1098
Component: engine
2015-09-08 17:01:14 -07:00
ebd47f0636
Merge pull request #16158 from duglin/Issue16146
...
Add --help to "docker volume inspect --help" output
Upstream-commit: 4b4597ae17d4fd8843aa9367fd1aa790cc74f7f6
Component: engine
2015-09-08 19:50:22 -04:00
2272874ccb
Merge pull request #16113 from Mashimiao/fix-bug-daemon-delete-link-remove
...
record the error of removing volumes when removing containers
Upstream-commit: 25418010efc695e695e6f86352f5f535d2e0a3be
Component: engine
2015-09-08 19:44:56 -04:00
de7b6665f3
Merge pull request #16123 from albers/completion-volume
...
bash completion for `docker volume`
Upstream-commit: 51662df329863cf0b2d9ef432af333940b7326cc
Component: engine
2015-09-08 16:21:49 -07:00
22903b10c1
Merge pull request #16096 from vdemeester/14756-final-golints
...
Final bits of enabling golint on the code base 🐹
Upstream-commit: 634a848b8e3bdd8aed834559f3b2e0dfc7f5ae3a
Component: engine
2015-09-08 15:25:55 -07:00
da721c9eef
Merge pull request #16148 from Microsoft/10662-fixlogging
...
Windows: Fix logging
Upstream-commit: 5c22cb5741fc3897734ef375150a8e9a4925cb06
Component: engine
2015-09-08 14:28:28 -07:00
74847cecc0
Merge pull request #16151 from LK4D4/light_stats
...
Don't read CPU usage if there is no subscribers for stats
Upstream-commit: fd32c471121d7dfc80b64201a98c10acbb9419fc
Component: engine
2015-09-08 14:26:54 -07:00
d879adf33b
Add --help to "docker volume inspect --help" output
...
Closes #16146
While in there, modified the testing infrastructure for the help text
so that we can get commands with nested commands - like "volume".
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 87255b6721f4dc02ae34696f2013537fdc967a99
Component: engine
2015-09-08 14:24:00 -07:00
4bdf1be246
integration-cli: add missing err check in TestRunNetworkNotInitializedNoneMode
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: d5a705b60036b1a914486bf700546e26e75e9e9d
Component: engine
2015-09-08 23:05:54 +02:00
03dac92f8b
Merge pull request #16153 from calavera/missing_ps_placeholder
...
Add missing ps placeholder to the docs.
Upstream-commit: 9fdb626bfbd7fc2939582fff444bfbfbc7e0c645
Component: engine
2015-09-08 13:42:10 -07:00
925d3576c1
Remove Steve Francia from maintainers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1666fbe287545a29ad8243a5144697cb8b96df89
Component: engine
2015-09-08 16:28:03 -04:00
fc4148454c
Add missing ps placeholder to the docs.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 914905f4526cbaf9e8b2179df42572ed8702e432
Component: engine
2015-09-08 16:12:26 -04:00
fcbe186c1d
Update validate-lint to find go files by itself
...
… and fixes the last bits that were missing :3.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0c70eb83813af6d5266769bc908593f9660b13f1
Component: engine
2015-09-08 22:07:42 +02:00
693377fda5
Merge pull request #16053 from sallyom/man-docker-tag
...
man docker-tag minor fixup
Upstream-commit: ab197f7ad220b095696e94765a437750885a542f
Component: engine
2015-09-08 21:45:27 +02:00
364794e2fe
Windows: Fix logging
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1d52c53eea22e413a42856154cc21a9f92cd5117
Component: engine
2015-09-08 12:18:50 -07:00
516a0b9247
Merge pull request #15368 from jengeb/docs-docker-start
...
[docs] Add instruction to start docker on Ubuntu
Upstream-commit: 1947ab6c1ef7517ac5a66dd11e02809f8f1cdc85
Component: engine
2015-09-08 11:59:13 -07:00
67980cf0b7
Merge pull request #16088 from jfrazelle/better-canonical-json-package
...
replace canonical json package
Upstream-commit: 479fcbb1d042a02cfc9b2d30ba844c3fdbb01d73
Component: engine
2015-09-08 11:58:24 -07:00
13060be786
Don't read CPU usage if there is no subscribers for stats
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: c486a3a6dc960dd0e6f977865a43ae0117f1545d
Component: engine
2015-09-08 11:57:22 -07:00
David Calavera
moxiegirl
Doug Davis
Anusha Ragunathan
Samuel Karp
Mike Brown
Arnaud Porterie
Jess Frazelle
Alexander Morozov
Harald Albers
Sebastiaan van Stijn
Antonio Murdaca
Hu Keping
Antonio Murdaca
Georgi Hristozov
Doug Davis
Vincent Demeester
devmeyster
Brian Goff
Alexander Morozov
John Howard