e1d3cb89f1
Merge pull request #16647 from vdemeester/revert-env-validation-docs
...
Update documentation on the revert on env validation
2015-10-05 15:27:45 -07:00
f41230b93a
Move builder files to builder/dockerfile
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-10-05 18:26:47 -04:00
aac5c44c10
Merge pull request #16776 from shishir-a412ed/docker_tag_error_msg
...
Make docker tag error message more user friendly
2015-10-05 22:06:29 +02:00
582a24e937
Make docker tag error message more user friendly
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-10-05 15:19:34 -04:00
33e9d70c82
Merge pull request #16718 from mavenugo/discovery
...
Vendoring libnetwork integrated with Docker discovery service
2015-10-05 12:06:36 -07:00
80f2e3f0c6
Merge pull request #16769 from LK4D4/fix_volume_socket
...
Allocate resources for server API before daemon creation
2015-10-05 20:48:41 +02:00
0339ed787c
Merge pull request #16747 from vdemeester/docs-testdirs
...
Update test-and-docs with TESTDIRS
2015-10-05 10:39:56 -07:00
2e557c5c9a
Merge pull request #16761 from sdurrheimer/zsh-completion-no-legacy-registry
...
Add zsh completion for 'docker daemon --no-legacy-registry'
2015-10-05 10:39:02 -07:00
ec1d8d7f2a
Merge pull request #16662 from moxiegirl/install-via-rpm
...
Updating the installations with rpm and yum install
2015-10-05 09:46:53 -07:00
5eda566f93
Allocate resources for server API before daemon creation
...
It prevents occupying of those resources (ports, unix-sockets) by
containers.
Also fixed false-positive test for that case.
Fix #15912
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-05 09:32:08 -07:00
482eca3099
devmapper: Few code cleanups
...
This patch does three things. Following are the descriptions.
===
Create a separate function for delete transactions so that parent function
is little smaller.
Also close transaction if an error happens.
===
When docker is being shutdown, save deviceset metadata first before
trying to remove the devices. Generally caller gives only 10 seconds
for shutdown to complete and then kills it after that. So if some device
is busy, we will wait 20 seconds for it removal and never be able to save
metadata. So first save metadata and then deal with device removal.
===
Move issue discard operation in a separate function. This makes reading code
little easier.
Also don't issue discards if device is still open. That means devices is
still probably being used and issuing discards is not a good idea.
This is especially true in case of deferred deletion. We want to issue
discards when device is not open. At that time device can be deleted too.
Otherwise we will issue discards and deletion will actually fail. Later
we will try deletion again and issue discards again and deletion will
fail again as device is open and busy.
So this will ensure that discards are issued once when device is not open
and it can actually be deleted.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-10-05 09:02:31 -04:00
072ac5e7f0
Merge pull request #16740 from vdemeester/remove-testify-and-mock
...
Remove use of testify mock and testify vendored lib
2015-10-05 09:42:16 +02:00
fbd0cea90c
Remove use of testify mock and testify vendored lib
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-05 08:43:34 +02:00
883fe220ec
Add zsh completion for 'docker daemon --no-legacy-registry'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-05 08:31:00 +02:00
b3fe785c72
Update documentation on the revert on env validation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-04 23:04:36 +02:00
67eb810a60
Merge pull request #16744 from runcom/fix-mam-commandline
...
Fix man and commandline docs
2015-10-04 22:28:19 +02:00
4843323a46
Merge pull request #16751 from albers/completion--no-legacy-registry
...
Add bash completion for `docker daemon --no-legacy-registry`
2015-10-04 22:13:51 +02:00
14e8898648
Fix man and commandline docs
...
- missing help option in `docs/reference/commandline/*.md` (some files
have it, the other I fixed didn't)
- missing `[OPTIONS]` in Usage description
- missing options
- formatting
- start/stop idempotence
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
2015-10-04 21:22:27 +02:00
0542939f40
Update test-and-docs with TESTDIRS
...
… and fix the rendering of `make test-unit` with TESTDIRS :)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-04 21:19:04 +02:00
e86291edd8
Merge pull request #16530 from dnephin/filter_events_by_label
...
Filter events by labels
2015-10-04 20:36:42 +02:00
5e061b5945
Updating the installations with rpm and yum install
...
Prefer rpm/yum over script install
Updating with review comments
Adding second round review comments
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-04 11:29:58 -07:00
e6ca006d86
Merge pull request #16561 from ai-traders/restart_on_debian
...
#16560 Add timeout to `sudo service docker stop` on sysvinit
2015-10-04 11:25:59 -07:00
dc204b8786
While #16738 is "fixed", skip TestExecStartFails
...
… on windows
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-04 18:38:21 +02:00
b78f66c472
Merge pull request #16509 from HuKeping/search-problem
...
Fix docker search problem
2015-10-04 18:21:32 +02:00
f04e8fdb9b
Fix docker search problem
...
Search terms shouldn't be restricted to only full valid repository
names. It should be perfectly valid to search using a part of a name,
even if it ends with a period, dash or underscore.
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-04 23:23:43 +08:00
3f04ab2fc7
Add bash completion for `--no-legacy-registry`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-10-04 06:49:42 -07:00
2fcacf8ea3
Merge pull request #16739 from dgageot/contribution_fix
...
Fix hidden link in contribution guide
2015-10-03 10:38:12 +02:00
a6cef38936
Merge pull request #16726 from sallyom/man-search
...
typo man/search
2015-10-03 10:26:18 +02:00
545ab6bf48
Fix hidden link in contribution guide
...
Signed-off-by: David Gageot <david@gageot.net>
2015-10-03 10:16:34 +02:00
139ea5b7f2
Docker daemon updates to libnetwork discovery support
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-02 20:57:47 -07:00
49066f621e
Merge pull request #16582 from vdemeester/16360-dockerCmd-raceytests
...
Fix TestDockerCmd*Timeout racey tests
2015-10-02 20:45:41 -04:00
da0cf69147
Merge pull request #16736 from cpuguy83/16706_let_the_undead_keep_names
...
Don't let `Names` be null on GET /containers/JSON
2015-10-02 16:55:21 -07:00
24e7907bb1
Merge pull request #16733 from MHBauer/perjury
...
remove testify asserts from pkg/discovery
2015-10-02 16:04:56 -07:00
0e17547af2
Merge pull request #16735 from LK4D4/style_fix
...
Fix some style issues
2015-10-03 01:03:44 +02:00
59b8a0f697
Don't let `Names` be null on GET /containers/JSON
...
Fixes an issue where a `Dead` container has no names so the API returns
`null` instead of an empty array.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-10-02 17:09:14 -04:00
c1713e7c5a
Documentation for filtering events by label
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 16:45:08 -04:00
01112989b7
Fix some style issues
...
Just read code and saw inconsistencies in variable decls and stuff.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-02 13:39:33 -07:00
08b117517d
Resolves #16458 - filter events by labels.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-10-02 16:33:20 -04:00
956fbccdaa
Vendoring in libnetwork integrated with Docker Discovery
...
This commit brings in end to end integration of Docker Discovery with
libnetwork multi-host networking.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-02 13:07:44 -07:00
eb13311129
remove testify asserts from pkg/discovery
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-10-02 13:05:15 -07:00
5a43beda91
Merge pull request #16250 from cpuguy83/15487_exec_error_codes
...
Make exec start return proper error codes
2015-10-02 12:55:17 -07:00
662f55d11d
Merge pull request #16708 from jfrazelle/fix-shm-mqueue-when-mounted-from-host
...
do not mount /dev/shm or /dev/mqueue if we are mounting from the host
2015-10-02 15:13:59 -04:00
134fefbaa2
Merge pull request #16490 from Microsoft/10662-mtimefix
...
Fixed file modified time not changing on windows
2015-10-02 12:06:03 -07:00
2d43d93410
Make exec start return proper error codes
...
Exec start was sending HTTP 500 for every error.
Fixed an error where pausing a container and then calling exec start
caused the daemon to freeze.
Updated API docs which incorrectly showed that a successful exec start
was an HTTP 201, in reality it is HTTP 200.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-10-02 14:40:22 -04:00
698e14902a
Merge pull request #16159 from runcom/validate-cpuset-cpus
...
Validate --cpuset-cpus, --cpuset-mems
2015-10-02 11:30:46 -07:00
bbac09a097
Merge pull request #16367 from Morgy93/names-generator
...
Added some adjectives and names
2015-10-02 11:29:09 -07:00
aa2e3247cb
Merge pull request #16470 from tonistiigi/fix-aufs-opq
...
Add basic support for .wh..wh..opq
2015-10-02 11:28:33 -07:00
d04fd5e0dc
Merge pull request #16594 from Microsoft/sjw/unc-build-fix
...
Windows: Fixing longpath hanlding of UNC paths.
2015-10-02 11:24:27 -07:00
d6f8365258
Merge pull request #16680 from dnephin/update_list_image_api_docs
...
Update api docs for /images/json
2015-10-02 11:23:49 -07:00
934d9d6323
add regression test for mounting /dev/shm from host
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-02 11:14:08 -07:00
moxiegirl
Tibor Vass
Antonio Murdaca
Shishir Mahajan
Arnaud Porterie
Vincent Demeester
Tianon Gravi
Jess Frazelle
Alexander Morozov
Vivek Goyal
Vincent Demeester
Steve Durrheimer
Sebastiaan van Stijn
Antonio Murdaca
Hu Keping
Harald Albers
David Gageot
Madhu Venugopal
Doug Davis
Brian Goff
Daniel Nephin
Morgan Bauer
Jessica Frazelle