Antonio Murdaca
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
Vincent Demeester
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
Antonio Murdaca
e86291edd8
Merge pull request #16530 from dnephin/filter_events_by_label
...
Filter events by labels
2015-10-04 20:36:42 +02:00
Mary Anthony
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
Tianon Gravi
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
Vincent Demeester
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
Vincent Demeester
b78f66c472
Merge pull request #16509 from HuKeping/search-problem
...
Fix docker search problem
2015-10-04 18:21:32 +02:00
Hu Keping
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
Harald Albers
3f04ab2fc7
Add bash completion for --no-legacy-registry
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-10-04 06:49:42 -07:00
Sebastiaan van Stijn
2fcacf8ea3
Merge pull request #16739 from dgageot/contribution_fix
...
Fix hidden link in contribution guide
2015-10-03 10:38:12 +02:00
Sebastiaan van Stijn
a6cef38936
Merge pull request #16726 from sallyom/man-search
...
typo man/search
2015-10-03 10:26:18 +02:00
David Gageot
545ab6bf48
Fix hidden link in contribution guide
...
Signed-off-by: David Gageot <david@gageot.net >
2015-10-03 10:16:34 +02:00
Madhu Venugopal
139ea5b7f2
Docker daemon updates to libnetwork discovery support
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-10-02 20:57:47 -07:00
Doug Davis
49066f621e
Merge pull request #16582 from vdemeester/16360-dockerCmd-raceytests
...
Fix TestDockerCmd*Timeout racey tests
2015-10-02 20:45:41 -04:00
Jess Frazelle
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
Jess Frazelle
24e7907bb1
Merge pull request #16733 from MHBauer/perjury
...
remove testify asserts from pkg/discovery
2015-10-02 16:04:56 -07:00
Antonio Murdaca
0e17547af2
Merge pull request #16735 from LK4D4/style_fix
...
Fix some style issues
2015-10-03 01:03:44 +02:00
Brian Goff
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
Daniel Nephin
c1713e7c5a
Documentation for filtering events by label
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-02 16:45:08 -04:00
Alexander Morozov
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
Daniel Nephin
08b117517d
Resolves #16458 - filter events by labels.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2015-10-02 16:33:20 -04:00
Madhu Venugopal
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
Morgan Bauer
eb13311129
remove testify asserts from pkg/discovery
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-10-02 13:05:15 -07:00
Jess Frazelle
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
Brian Goff
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
Jess Frazelle
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
Brian Goff
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
Jess Frazelle
698e14902a
Merge pull request #16159 from runcom/validate-cpuset-cpus
...
Validate --cpuset-cpus, --cpuset-mems
2015-10-02 11:30:46 -07:00
Jess Frazelle
bbac09a097
Merge pull request #16367 from Morgy93/names-generator
...
Added some adjectives and names
2015-10-02 11:29:09 -07:00
Jess Frazelle
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
Jess Frazelle
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
Jess Frazelle
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
Jessica Frazelle
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
Jessica Frazelle
b8605a1107
do not mount /dev/shm or /dev/mqueue if we are mounting from the host
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-10-02 11:14:04 -07:00
Vincent Demeester
830729bb94
Merge pull request #15472 from coolljt0725/fix_docker_ps_trucate_id
...
Fix docker ps truncate long image name
2015-10-02 18:56:55 +01:00
Tianon Gravi
970bc4b5c1
Merge pull request #16707 from jfrazelle/fix-release
...
fix release script gpg key id
2015-10-02 10:13:51 -07:00
Sally O'Malley
435e30e42f
typo man/search
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-10-02 11:24:31 -04:00
Lei Jitang
3fcf481361
Fix docker ps truncate long image name by default
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-10-02 22:56:42 +08:00
Vincent Demeester
77da5d8feb
Merge pull request #16076 from vbatts/export_image_times
...
graph: exported images times matching creation
2015-10-01 21:50:43 +01:00
Jessica Frazelle
cb0ce5bb76
fix release script gpg key id
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-10-01 13:22:33 -07:00
Vincent Batts
e4478caddf
save: integration test for timestamp matching
...
The `docker save`ed output ought to have matching timestamp to the layer
creation.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-10-01 14:38:55 -04:00
Alexander Morozov
99d13e7e14
Merge pull request #16698 from rhvgoyal/drop-redundant-lock
...
devmapper: Drop redundant lock and redundant function
2015-10-01 10:48:03 -07:00
Darren Stahl
40b77af234
Fixed file modified time not changing on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
2015-10-01 10:45:32 -07:00
Jess Frazelle
b26bcfe9be
Merge pull request #16687 from jfrazelle/update-man8
...
ignore man8
2015-10-01 10:23:56 -07:00
Jessica Frazelle
cf8688c235
ignore man8
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-10-01 10:05:51 -07:00
Vivek Goyal
289145ecc6
devmapper: Get rid of metaData.devicesLock
...
Right now we seem to have 3 locks.
- devinfo.lock
This is a per device lock
- metaData.devicesLock
This is supposedely protecting map of devices.
- Global DeviceSet lock
This is protecting map of devices as well as serializing calls to libdevmapper.
Semantics of per devices lock and global deviceset lock seem to be very clear.
Even ordering between these two locks has been defined properly.
What is not clear is the need and ordering of metaData.devicesLock. Looks like
this lock is not necessary and global DeviceSet lock should be used to
protect map of devices as it is part of DeviceSet.
This patchset gets rid of metaData.devicesLock and instead uses DeviceSet
lock to protect map of devices.
Also at couple of places during initialization takes devices.Lock(). That
is not strictly necessary as there is supposed to be one thread of execution
during initializaiton. Still it makes the code clearer.
I think this makes code more clear and easier to understand and easier to
make further changes.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-10-01 13:02:55 -04:00
Vivek Goyal
73f8b46d84
devmapper: Get rid of unused function HasActivatedDevice()
...
Looks like nobody is calling HasActivatedDevice(). Get rid of it.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-10-01 07:59:12 -04:00
Vincent Batts
a3b04de401
Merge pull request #16686 from rhvgoyal/more-fixes
...
devicemapper: A bug fix and a code improvement
2015-09-30 23:01:00 -04:00
Stefan J. Wernli
6d223febda
Windows: Fixing longpath hanlding of UNC paths.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
2015-09-30 19:36:08 -07:00
Vivek Goyal
94caae2477
devmapper: Move maxDeviceID check in loadMetadata
...
maxDeviceID is upper limit on device Id thin pool can support. Right now
we have this check only during startup. It is a good idea to move this
check in loadMetadata so that any time a device file is loaded and if it
is corrupted and device Id is more than maxDevieceID, it will be detected
right then and there.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-09-30 18:54:06 -04:00