Commit Graph

21804 Commits

Author SHA1 Message Date
0eed66fc40 Merge pull request #16769 from LK4D4/fix_volume_socket
Allocate resources for server API before daemon creation
Upstream-commit: 80f2e3f0c6d8c439ba0d4b53162dcf1610ad2d46
Component: engine
2015-10-05 20:48:41 +02:00
b9a953d801 Merge pull request #16747 from vdemeester/docs-testdirs
Update test-and-docs with TESTDIRS
Upstream-commit: 0339ed787c4e7795ad8b3f6d3a230ba8dcec4d48
Component: engine
2015-10-05 10:39:56 -07:00
f8989092f7 Merge pull request #16761 from sdurrheimer/zsh-completion-no-legacy-registry
Add zsh completion for 'docker daemon --no-legacy-registry'
Upstream-commit: 2e557c5c9a462c11b606f83d60d479c5ea46576e
Component: engine
2015-10-05 10:39:02 -07:00
165ebff00d Merge pull request #16662 from moxiegirl/install-via-rpm
Updating the installations with rpm and yum install
Upstream-commit: ec1d8d7f2a8f563deb61df2b35aa8a9d6a07c3e2
Component: engine
2015-10-05 09:46:53 -07:00
c12ca2de3a 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>
Upstream-commit: 5eda566f937dddef9d4267dd8b8b1d8c3e47b290
Component: engine
2015-10-05 09:32:08 -07:00
1c5745b90e 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>
Upstream-commit: 482eca3099ad4bf3a7db62a31f88e2158cbbc933
Component: engine
2015-10-05 09:02:31 -04:00
a9ec8630f8 Merge pull request #16740 from vdemeester/remove-testify-and-mock
Remove use of testify mock and testify vendored lib
Upstream-commit: 072ac5e7f061aaece6693bb17510b3e968ac4971
Component: engine
2015-10-05 09:42:16 +02:00
9c4712a315 Remove use of testify mock and testify vendored lib
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: fbd0cea90cec03b233453592996627e88af70f8d
Component: engine
2015-10-05 08:43:34 +02:00
29630cd41d Add zsh completion for 'docker daemon --no-legacy-registry'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 883fe220ec0016922cf769f6ff8b7f85d9994d82
Component: engine
2015-10-05 08:31:00 +02:00
c1ad8272d0 Update documentation on the revert on env validation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b3fe785c7267bff533c9b2fc324c58e37796e973
Component: engine
2015-10-04 23:04:36 +02:00
72f4bc7137 Merge pull request #16744 from runcom/fix-mam-commandline
Fix man and commandline docs
Upstream-commit: 67eb810a604905df0a33ce20085c8aeddfb0171a
Component: engine
2015-10-04 22:28:19 +02:00
356a51b97e Merge pull request #16751 from albers/completion--no-legacy-registry
Add bash completion for `docker daemon --no-legacy-registry`
Upstream-commit: 4843323a46dc5aa101a111a35fcce6eacfad5bd0
Component: engine
2015-10-04 22:13:51 +02:00
b51b5af287 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>
Upstream-commit: 14e8898648909379f37049828e103ba1c97f253b
Component: engine
2015-10-04 21:22:27 +02:00
3e4d4e0287 Update test-and-docs with TESTDIRS
… and fix the rendering of `make test-unit` with TESTDIRS :)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0542939f405ce6c5cad42bd715d7ceefd573db75
Component: engine
2015-10-04 21:19:04 +02:00
e846ce8223 Merge pull request #16530 from dnephin/filter_events_by_label
Filter events by labels
Upstream-commit: e86291edd88641cc866c842d0f4a8f8296820aeb
Component: engine
2015-10-04 20:36:42 +02:00
1aa805ef60 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>
Upstream-commit: 5e061b5945df047c68953aa424fafbc5a2706ab5
Component: engine
2015-10-04 11:29:58 -07:00
373a4e79bb Merge pull request #16561 from ai-traders/restart_on_debian
#16560 Add timeout to `sudo service docker stop` on sysvinit
Upstream-commit: e6ca006d8634a0fa9c6eb655aa9c872b84c5e438
Component: engine
2015-10-04 11:25:59 -07:00
ec3df7c39d While #16738 is "fixed", skip TestExecStartFails
… on windows

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: dc204b87864a06d37f9515b57bd6f76dac24a016
Component: engine
2015-10-04 18:38:21 +02:00
a3a78e3ce4 Merge pull request #16509 from HuKeping/search-problem
Fix docker search problem
Upstream-commit: b78f66c472399bf56bd5110dbdaac5e5676396c8
Component: engine
2015-10-04 18:21:32 +02:00
a66830822a 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>
Upstream-commit: f04e8fdb9bbcdad28de5c328b7de3f3abdae0b5a
Component: engine
2015-10-04 23:23:43 +08:00
e3177a2c43 Add bash completion for --no-legacy-registry
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3f04ab2fc773a89f2ff465d995d10793a67f23a2
Component: engine
2015-10-04 06:49:42 -07:00
781198dc30 Merge pull request #16739 from dgageot/contribution_fix
Fix hidden link in contribution guide
Upstream-commit: 2fcacf8ea3898b731828866f09df3ccd8bfb8f9b
Component: engine
2015-10-03 10:38:12 +02:00
acc6593d19 Merge pull request #16726 from sallyom/man-search
typo man/search
Upstream-commit: a6cef38936d8ba448d9f2e5b7778ae648ac4a519
Component: engine
2015-10-03 10:26:18 +02:00
5ec5ed45a2 Fix hidden link in contribution guide
Signed-off-by: David Gageot <david@gageot.net>
Upstream-commit: 545ab6bf48a5a092e0f1ef79485ac5ee38de8525
Component: engine
2015-10-03 10:16:34 +02:00
b6b2359efc Docker daemon updates to libnetwork discovery support
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 139ea5b7f2a1b981a8c9556a21e52ceaa8c65d5c
Component: engine
2015-10-02 20:57:47 -07:00
b1b064f9e8 Merge pull request #16582 from vdemeester/16360-dockerCmd-raceytests
Fix TestDockerCmd*Timeout racey tests
Upstream-commit: 49066f621e9cfd3e83a3a6e12ca254a68f4c41bb
Component: engine
2015-10-02 20:45:41 -04:00
5d9a13c069 Merge pull request #16736 from cpuguy83/16706_let_the_undead_keep_names
Don't let `Names` be null on GET /containers/JSON
Upstream-commit: da0cf691471dc80cdf5bf4b9e7b60297b6d54edf
Component: engine
2015-10-02 16:55:21 -07:00
f767f0010d Merge pull request #16733 from MHBauer/perjury
remove testify asserts from pkg/discovery
Upstream-commit: 24e7907bb15c7aa32a04310cd8604636a8b80586
Component: engine
2015-10-02 16:04:56 -07:00
45e90797a0 Merge pull request #16735 from LK4D4/style_fix
Fix some style issues
Upstream-commit: 0e17547af2a8bd13dd8d7aa68d01c7ce02566340
Component: engine
2015-10-03 01:03:44 +02:00
5fa21cf8ee 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>
Upstream-commit: 59b8a0f697355f1d404121f0c3e96c4957ac4608
Component: engine
2015-10-02 17:09:14 -04:00
883f553c16 Documentation for filtering events by label
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c1713e7c5a8f2eee7d78b17eef81b0d4203aabdd
Component: engine
2015-10-02 16:45:08 -04:00
e3ead3ca7f Fix some style issues
Just read code and saw inconsistencies in variable decls and stuff.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 01112989b71523df006b00f66b8585a18f634add
Component: engine
2015-10-02 13:39:33 -07:00
1dfde818a2 Resolves #16458 - filter events by labels.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 08b117517d6d6b5daebe4c056c135e1598f44385
Component: engine
2015-10-02 16:33:20 -04:00
d0c8047b82 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>
Upstream-commit: 956fbccdaa52e3dedac53b039671de1fd7f54d02
Component: engine
2015-10-02 13:07:44 -07:00
f447a82451 remove testify asserts from pkg/discovery
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: eb13311129c75a11c05ec8c50f6f4c33951a07b9
Component: engine
2015-10-02 13:05:15 -07:00
3b057aaeb2 Merge pull request #16250 from cpuguy83/15487_exec_error_codes
Make exec start return proper error codes
Upstream-commit: 5a43beda91efd9a53c798082abbc5b287167aa0c
Component: engine
2015-10-02 12:55:17 -07:00
56b56acf38 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
Upstream-commit: 662f55d11d2f278daf5b9be215608540af35be4d
Component: engine
2015-10-02 15:13:59 -04:00
d911d85df7 Merge pull request #16490 from Microsoft/10662-mtimefix
Fixed file modified time not changing on windows
Upstream-commit: 134fefbaa2b63e337a5ef247111bb5a2733809be
Component: engine
2015-10-02 12:06:03 -07:00
a9fcaeb043 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>
Upstream-commit: 2d43d93410c29cec87deb9cd940c3b2a8af5fbbb
Component: engine
2015-10-02 14:40:22 -04:00
f14e695085 Merge pull request #16159 from runcom/validate-cpuset-cpus
Validate --cpuset-cpus, --cpuset-mems
Upstream-commit: 698e14902a06af0613b697d88935ae0200659bff
Component: engine
2015-10-02 11:30:46 -07:00
f12a07a163 Merge pull request #16367 from Morgy93/names-generator
Added some adjectives and names
Upstream-commit: bbac09a0976b946724d5fc0ac17eddf9ee8e9a61
Component: engine
2015-10-02 11:29:09 -07:00
7d8a56e425 Merge pull request #16470 from tonistiigi/fix-aufs-opq
Add basic support for .wh..wh..opq
Upstream-commit: aa2e3247cb87a7a55fa0258b4ae92c026512ed2a
Component: engine
2015-10-02 11:28:33 -07:00
15faad6822 Merge pull request #16594 from Microsoft/sjw/unc-build-fix
Windows: Fixing longpath hanlding of UNC paths.
Upstream-commit: d04fd5e0dc4d84c5b7ab6e78d58a6d71ed739fef
Component: engine
2015-10-02 11:24:27 -07:00
f5fe88af39 Merge pull request #16680 from dnephin/update_list_image_api_docs
Update api docs for /images/json
Upstream-commit: d6f83652588fa39753a92fd046e8b837c0ac6cd4
Component: engine
2015-10-02 11:23:49 -07:00
0cd51b7f83 add regression test for mounting /dev/shm from host
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 934d9d632313acd338608ca1ad25c5270463e9c0
Component: engine
2015-10-02 11:14:08 -07:00
c09d7183ed do not mount /dev/shm or /dev/mqueue if we are mounting from the host
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: b8605a11070af73713f2127d9e9d3e35bb78e1ab
Component: engine
2015-10-02 11:14:04 -07:00
8abb43049d Merge pull request #15472 from coolljt0725/fix_docker_ps_trucate_id
Fix docker ps truncate long image name
Upstream-commit: 830729bb94e8af8e6d9967da77673c13119cc00a
Component: engine
2015-10-02 18:56:55 +01:00
2a71b21783 Merge pull request #16707 from jfrazelle/fix-release
fix release script gpg key id
Upstream-commit: 970bc4b5c118f10754432d472e405457483a21dd
Component: engine
2015-10-02 10:13:51 -07:00
76767dc67b typo man/search
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 435e30e42f794143ed90ca5a3777f63a1c61ce83
Component: engine
2015-10-02 11:24:31 -04:00
6f5edad812 Fix docker ps truncate long image name by default
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3fcf481361400acd5e56da2a8c76cf888092b2e4
Component: engine
2015-10-02 22:56:42 +08:00