726b8dc951
awslogs: fix logrus import
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 32964def832f76f29991100c76af09513de19693
Component: engine
2015-09-11 11:05:06 -07:00
3ef5fa238d
Merge pull request #16240 from Microsoft/10662-stopsignal
...
Windows: Nice error on stopsignal
Upstream-commit: ec6d91ce434c0cb2fa87504215b7a6a15fb02d3a
Component: engine
2015-09-11 11:00:12 -07:00
c3a694b001
Merge pull request #16215 from HuKeping/save
...
Refactor CLI docker save
Upstream-commit: bc48194ded4892d277345e45defee66a24f36399
Component: engine
2015-09-11 13:52:59 -04:00
15c37f9e38
Merge pull request #16194 from yosifkit/fix-nuke
...
Fix nuke script
Upstream-commit: f9e5a693ed831870998b270dbdb7a4655a4fb356
Component: engine
2015-09-11 10:26:22 -07:00
128f497a4a
Merge pull request #16026 from vdemeester/integration-cli-utils-tests
...
Add unit tests for integration cli utils.go functions
Upstream-commit: 335689118bfb0451885221a9706d01c7d3c2bda6
Component: engine
2015-09-11 10:21:09 -07:00
648a4ae80b
Merge pull request #16224 from jfrazelle/no-release-dirty
...
do not allow the release of a dirty binary
Upstream-commit: dc1cc46348548d46dc1c307d3baf11249cbd490e
Component: engine
2015-09-11 10:08:55 -07:00
81f0877adb
Windows: Nice error on stopsignal
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8de7fcaf7e9b0c6e99ddd09021e8a746a68a8e63
Component: engine
2015-09-11 09:40:23 -07:00
811680bcf5
Merge pull request #15307 from calavera/stop_signal
...
Signal to stop a container.
Upstream-commit: db54c79d7cd4ca055f9a1ddf4198cdcba9eb7d46
Component: engine
2015-09-11 09:25:18 -07:00
b7b1e671cd
Refactor CLI docker save
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 22be1e443fa49bafd6aa3ab6c1eb0595fd9fb2b1
Component: engine
2015-09-11 15:31:55 +08:00
665a3fd69c
Merge pull request #16226 from aaronlehmann/broadcaster-catch-up
...
Broadcaster writer goroutines must only finish when they are caught up
Upstream-commit: 7064fe283f1d63785f2812b8a23c8b4d80b58178
Component: engine
2015-09-10 22:55:44 -04:00
1e38e54eff
Add STOPSIGNAL instruction to dockerfiles.
...
This way, images creators can set the exit signal their programs use.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3781cde61ff10b1d9114ae5b4c5c1d1b2c20a1ee
Component: engine
2015-09-10 19:56:05 -04:00
d563cc164c
Signal to stop a container.
...
Allow to set the signal to stop a container in `docker run`:
- Use `--stop-signal` with docker-run to set the default signal the container will use to exit.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 0e50d946a25beb134bce2aaf4a209b5cfcbacf8f
Component: engine
2015-09-10 19:56:05 -04:00
0744d7a97a
Merge pull request #13185 from NOX73/10139-tags-list-get-image-api
...
Added tags list to /images/:id/json api.
Upstream-commit: bb1996ab8f6b3d4af66abd3bb62754e30908530c
Component: engine
2015-09-10 16:40:44 -07:00
b0cc871982
Broadcaster writer goroutines must only finish when they are caught up
...
Without this change, there was a narrow race condition that would allow
writers to finish when there was still data left to write. This is
likely to be what was causing some integration tests to fail with
truncated pull output.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 947519bfb31024ea8c76e8e303f2c338b00265f2
Component: engine
2015-09-10 14:58:06 -07:00
80380437cf
do not allow the release of a dirty binary
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: b18d664692f4a2c15e4e62697547f9238193a493
Component: engine
2015-09-10 12:28:09 -07:00
f9ba04b455
Merge pull request #16191 from runcom/daemon-remove-unused-function-params
...
daemon: remove unused function params
Upstream-commit: 65e43593f58b2eb0666a0cc90609aa3f56c6af6a
Component: engine
2015-09-10 10:23:52 -07:00
12562031e9
Merge pull request #16086 from cezarsa/full_stack_dump
...
Ensure goroutines dump is not truncated
Upstream-commit: c8dc729af41f8b10ea4cc42e1ae12b0966e66e1d
Component: engine
2015-09-10 11:16:28 -04:00
353e9fa1d4
Merge pull request #16104 from vdemeester/httputils-withmock
...
Update httputils tests
Upstream-commit: 08a2e475bc4d012e5eac43ea4556753ad16354b1
Component: engine
2015-09-10 11:00:17 -04:00
8487254d2a
Merge pull request #16213 from HuKeping/minor
...
Minor typo
Upstream-commit: 727f083a378588ab2ee7d68c2747ffbd0cd1c721
Component: engine
2015-09-10 09:55:49 -04:00
9f56a7069d
Added tags list to /images/:id/json api.
...
It closes #10139 .
Signed-off-by: Rozhnov Alexandr <nox73@ya.ru >
Upstream-commit: e9e68fa2d29a5e3053fb876b19b5ac5bc6d1c222
Component: engine
2015-09-10 11:55:01 +03:00
e5d596c8b2
Minor typo
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 40d3ce1063a4dabfb1634a4f0739dea05b63a344
Component: engine
2015-09-10 14:13:15 +08:00
a90d6930ab
Remove stray please
...
Signed-off-by: Trevor <trevinwoodstock@gmail.com >
Upstream-commit: 012bdac6d68f006351e43b11b258259f4af26e20
Component: engine
2015-09-09 21:21:23 -04:00
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
27754298e2
Fix nuke script to remove from end of path
...
Signed-off-by: Joe Ferguson <joe@infosiftr.com >
Upstream-commit: d2e9f6c0c1d2f6a88316198778515fe098d02dec
Component: engine
2015-09-09 15:34:05 -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
2ced70f4fb
daemon: remove unused function params
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 587823af2723801ffdb6841b6e2c3d7d73ff10db
Component: engine
2015-09-09 22:37:46 +02: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
3d19f9af55
Add unit tests for integration cli utils function
...
- utils_test.go and docker_utils_test.go
- Moved docker related function to docker_utils.go
- add a test for integration-cli/checker
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5109071706cab06257b21172627ce51e5fa3a88c
Component: engine
2015-09-09 15:36:44 +02:00
e738ec47f9
Update httputils tests
...
- Make sure we use httptest instead of depending on network
- Update resumablerequestreader tests
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5c80c3fb3c38dcf5b19dd728f17473519c5cdca3
Component: engine
2015-09-09 14:59:25 +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
Alexander Morozov
Jess Frazelle
Brian Goff
Tianon Gravi
John Howard
David Calavera
Hu Keping
Aaron Lehmann
Jessica Frazelle
Doug Davis
Rozhnov Alexandr
Trevor
moxiegirl
Joe Ferguson
Doug Davis
Anusha Ragunathan
Samuel Karp
Antonio Murdaca
Mike Brown
Arnaud Porterie
Alexander Morozov
Harald Albers
Sebastiaan van Stijn
Vincent Demeester
Antonio Murdaca
Georgi Hristozov