Mrunal Patel
c8291f7107
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)
(cherry picked from commit d88fe447df
)
2015-09-11 14:02:11 -04:00
Mrunal Patel
3f631b0d94
Modify test to include /dev/shm sharing
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
(cherry picked from commit 457aeaa2e1
)
2015-09-11 14:02:11 -04:00
Jess Frazelle
ec6d91ce43
Merge pull request #16240 from Microsoft/10662-stopsignal
...
Windows: Nice error on stopsignal
2015-09-11 11:00:12 -07:00
Brian Goff
bc48194ded
Merge pull request #16215 from HuKeping/save
...
Refactor CLI docker save
2015-09-11 13:52:59 -04:00
Tianon Gravi
f9e5a693ed
Merge pull request #16194 from yosifkit/fix-nuke
...
Fix nuke script
2015-09-11 10:26:22 -07:00
Jess Frazelle
335689118b
Merge pull request #16026 from vdemeester/integration-cli-utils-tests
...
Add unit tests for integration cli utils.go functions
2015-09-11 10:21:09 -07:00
Jess Frazelle
dc1cc46348
Merge pull request #16224 from jfrazelle/no-release-dirty
...
do not allow the release of a dirty binary
2015-09-11 10:08:55 -07:00
John Howard
8de7fcaf7e
Windows: Nice error on stopsignal
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-11 09:40:23 -07:00
David Calavera
db54c79d7c
Merge pull request #15307 from calavera/stop_signal
...
Signal to stop a container.
2015-09-11 09:25:18 -07:00
Hu Keping
22be1e443f
Refactor CLI docker save
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-11 15:31:55 +08:00
Brian Goff
7064fe283f
Merge pull request #16226 from aaronlehmann/broadcaster-catch-up
...
Broadcaster writer goroutines must only finish when they are caught up
2015-09-10 22:55:44 -04:00
David Calavera
3781cde61f
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>
2015-09-10 19:56:05 -04:00
David Calavera
0e50d946a2
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>
2015-09-10 19:56:05 -04:00
David Calavera
bb1996ab8f
Merge pull request #13185 from NOX73/10139-tags-list-get-image-api
...
Added tags list to /images/:id/json api.
2015-09-10 16:40:44 -07:00
Aaron Lehmann
947519bfb3
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>
2015-09-10 14:58:06 -07:00
Jessica Frazelle
b18d664692
do not allow the release of a dirty binary
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-09-10 12:28:09 -07:00
David Calavera
65e43593f5
Merge pull request #16191 from runcom/daemon-remove-unused-function-params
...
daemon: remove unused function params
2015-09-10 10:23:52 -07:00
Brian Goff
c8dc729af4
Merge pull request #16086 from cezarsa/full_stack_dump
...
Ensure goroutines dump is not truncated
2015-09-10 11:16:28 -04:00
Brian Goff
08a2e475bc
Merge pull request #16104 from vdemeester/httputils-withmock
...
Update httputils tests
2015-09-10 11:00:17 -04:00
Doug Davis
727f083a37
Merge pull request #16213 from HuKeping/minor
...
Minor typo
2015-09-10 09:55:49 -04:00
Rozhnov Alexandr
e9e68fa2d2
Added tags list to /images/:id/json api.
...
It closes #10139 .
Signed-off-by: Rozhnov Alexandr <nox73@ya.ru>
2015-09-10 11:55:01 +03:00
Hu Keping
40d3ce1063
Minor typo
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-10 14:13:15 +08:00
Sebastiaan van Stijn
072790bb3b
Merge pull request #16202 from tnws/fix-please
...
Remove stray please
2015-09-10 07:59:46 +02:00
Trevor
012bdac6d6
Remove stray please
...
Signed-off-by: Trevor <trevinwoodstock@gmail.com>
2015-09-09 21:21:23 -04:00
David Calavera
6efe45990d
Merge pull request #15953 from duglin/DaemonContext
...
Add a "context" to the api/server/* code
2015-09-09 17:28:38 -07:00
David Calavera
9f517fc5bb
Merge pull request #15495 from samuelkarp/awslogs-logging-driver
...
Add awslogs driver for Amazon CloudWatch Logs
2015-09-09 17:19:39 -07:00
moxiegirl
8855bf3500
Merge pull request #16023 from mikebrow/12854-update-irc-webpage
...
refresh where to chat page; and add IRCCloud to IRC Quickstart
2015-09-09 17:14:28 -07:00
moxiegirl
b154a6f68e
Merge pull request #16188 from albers/docs-volume-help
...
Update docs and man pages for `docker volume` subcommands
2015-09-09 17:13:21 -07:00
Joe Ferguson
d2e9f6c0c1
Fix nuke script to remove from end of path
...
Signed-off-by: Joe Ferguson <joe@infosiftr.com>
2015-09-09 15:34:05 -07:00
David Calavera
72f355e466
Merge pull request #16192 from anusha-ragunathan/dev
...
Updated rpm spec to perform cleaner installs
2015-09-09 15:26:36 -07:00
Doug Davis
f790496d8b
Move context stuff to its own package
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-09-09 14:23:25 -07:00
Anusha Ragunathan
1caa9a7d16
Updated rpm spec to perform cleaner installs
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
2015-09-09 17:13:57 -04:00
Samuel Karp
3effe484e6
Add awslogs driver for Amazon CloudWatch Logs
...
Signed-off-by: Samuel Karp <skarp@amazon.com>
2015-09-09 13:52:40 -07:00
Samuel Karp
85433365cc
Vendor AWS Go SDK
...
Signed-off-by: Samuel Karp <skarp@amazon.com>
2015-09-09 13:51:14 -07:00
Antonio Murdaca
587823af27
daemon: remove unused function params
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-09 22:37:46 +02:00
David Calavera
a796ac5318
Merge pull request #14626 from kunalkushwaha/add-network-cli-help
...
"docker network" missing from docker --help
2015-09-09 13:36:43 -07:00
Mike Brown
82fce53103
addressing useability comments per @moxiegirl
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2015-09-09 14:59:30 -05:00
Doug Davis
8b454dd79e
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>
2015-09-09 12:51:20 -07:00
Arnaud Porterie
5ff63b6946
Merge pull request #16154 from calavera/remove_steve_from_maintainers
...
Remove Steve Francia from maintainers.
2015-09-09 12:38:59 -07:00
Jess Frazelle
d333849459
Merge pull request #16162 from cpuguy83/16071_fix_lstat_errors
...
Ignore stat errors on volume rm.
2015-09-09 11:55:14 -07:00
Jess Frazelle
0072896445
Merge pull request #16171 from vdemeester/lint-only-on-diff
...
Golint only on changed files
2015-09-09 10:19:16 -07:00
Alexander Morozov
5d67fd5fb2
Merge pull request #16185 from runcom/fix-pkg-devicemapper-typo
...
pkg: devicemapper: fix typo in function declaration
2015-09-09 10:17:52 -07:00
Harald Albers
2724010364
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>
2015-09-09 19:16:39 +02:00
Jess Frazelle
3d8aae1308
Merge pull request #16149 from LK4D4/remove_link_libs
...
Remove -lpthread and -ldl from ldflags
2015-09-09 10:13:36 -07:00
Sebastiaan van Stijn
34752e091d
Merge pull request #16179 from hristozov/patch-1
...
Update the time since Linux 2.6.26 in the security article
2015-09-09 18:33:50 +02:00
Brian Goff
58ae808d42
Merge pull request #16180 from HuKeping/graph
...
We don't need image layer stream when create the rootfs
2015-09-09 10:16:31 -04:00
Antonio Murdaca
d4a123b20b
pkg: devicemapper: fix typo in function declaration
...
6990b76a69
introduced a typo in function
declaration, this patch fixes that.
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-09 15:57:52 +02:00
Vincent Demeester
5109071706
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>
2015-09-09 15:36:44 +02:00
Vincent Demeester
5c80c3fb3c
Update httputils tests
...
- Make sure we use httptest instead of depending on network
- Update resumablerequestreader tests
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-09-09 14:59:25 +02:00
Hu Keping
f70c592137
We don't need image layer stream when create the rootfs
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-09-09 20:31:08 +08:00