beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
27099 commits 14 branches 412 tags 338 MiB
Commit graph

27099 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Goff
4219c0018f Merge pull request #25777 from swernli/servicing_race 
Fixing race in Windows container servicing
 2016-09-08 10:42:15 -04:00
Sven Dowideit
5be6ccc433 Merge pull request #24586 from farcaller/gcplogs 
Added optional flags to init gcp logger metadata
 2016-09-08 13:47:48 +10:00
Brian Goff
48c615f853 Merge pull request #25891 from Microsoft/jjh/processlist 
Windows: Docker top implementation
 2016-09-07 20:58:20 -04:00
Alexander Morozov
e482d8472b Merge pull request #26395 from unclejack/bump_go_to_1.7.1 
Dockerfile*: bump Go to 1.7.1
 2016-09-07 17:17:38 -07:00
Tõnis Tiigi
b890d475f7 Merge pull request #25806 from Microsoft/jjh-missingdigest 
Don't fail daemon start on missing layer
 2016-09-07 16:35:27 -07:00
John Howard
52f0474851 Windows: docker top implementation 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-07 16:29:02 -07:00
unclejack
1668894d04 Dockerfile*: bump Go to 1.7.1 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2016-09-08 00:42:35 +03:00
Brian Goff
ce5eb34e68 Merge pull request #26378 from rhvgoyal/fix-max-retries 
devmapper: Fail to start container if xfs_nospace_max_retries can't be enforced
 2016-09-07 16:56:45 -04:00
John Howard
540c8e9b20 Windows: Skip layers+base images 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-07 12:16:45 -07:00
Charles Smith
426a0af075 Merge pull request #26256 from mstanleyjones/rewrite_understanding_docker 
Rewrites to Understanding Docker topic for clarity
 2016-09-07 11:36:58 -07:00
Michael Crosby
3ea762b9f6 Merge pull request #26349 from crosbymichael/api-to-docker 
Move engine-api to docker
 2016-09-07 11:08:11 -07:00
Michael Crosby
7c36a1af03 Move engine-api client package 
This moves the engine-api client package to `/docker/docker/client`.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-09-07 11:05:58 -07:00
Michael Crosby
91e197d614 Add engine-api types to docker 
This moves the types for the `engine-api` repo to the existing types
package.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-09-07 11:05:58 -07:00
Vivek Goyal
6cc55dd65b devmapper: Fail to start container if xfs_nospace_max_retries can't be enforced 
We just introduced a new tunable dm.xfs_nospace_max_retries. But this tunable
will work only on new kernels where xfs supports this feature. On older
kernels xfs does not allow tuning this behavior.

There are two issues. First one is that if xfsSetNospaceRetries() fails,
it returns error but leaves the device activated and mounted. We should
be unmounting the device and deactivate it before returning.
 
Second issue is, if docker is started on older kernel, with
dm.xfs_nospace_max_retries specified, then docker will silently ignore the
fact that /sys file to tweak this behavior is not present and will continue.
But I think it might be better to fail container creation/start if kernel
does not support this feature.

This patch fixes it. After this patch, user will get an error like following
when container is run.

# docker run -ti fedora bash
docker: Error response from daemon: devmapper: user specified daemon option dm.xfs_nospace_max_retries but it does not seem to be supported on this system :open /sys/fs/xfs/dm-5/error/metadata/ENOSPC/max_retries: no such file or directory.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
 2016-09-07 14:03:01 -04:00
Misty Stanley-Jones
12b740b65c Rewrites to Understanding Docker topic for clarity 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-07 11:02:03 -07:00
Tõnis Tiigi
a6daa94e3e Merge pull request #26342 from cpuguy83/20079_restore_volume_migrate 
restore migrating pre-1.7.0 volumes
 2016-09-07 10:56:07 -07:00
Charles Smith
6f0502b89b Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage 
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905)
 2016-09-07 10:38:59 -07:00
Aaron Lehmann
86124ca04b Merge pull request #23100 from runcom/fix-stores 
support legacy registries in exernal stores
 2016-09-07 09:44:41 -07:00
Brian Goff
94cfa2cc37 Merge pull request #26209 from allencloud/validate-heartbeat-in-discovery 
validate heartbeat in discovery cluster opts
 2016-09-07 12:11:53 -04:00
Brian Goff
4f8ca47977 Merge pull request #26376 from dnephin/remove_manpagegen_from_main_dockerfile 
Remove download of man page generator dependencies
 2016-09-07 11:47:01 -04:00
Brian Goff
93c915b385 Merge pull request #26345 from albers/completion-events-health_status 
Add completion for `docker events -f event=health_status`
 2016-09-07 11:38:33 -04:00
Brian Goff
6168e98a13 Merge pull request #26115 from yongtang/08292016-info-registry-mirrors 
Add registry mirrors information in the output of `docker info`
 2016-09-07 11:37:36 -04:00
Daniel Nephin
20607e2cc2 Merge pull request #26269 from yuexiao-wang/remove-option 
Remove the option for the command service rm
 2016-09-07 11:31:11 -04:00
Daniel Nephin
d0fa13a502 Remove download of man page generator dependencies, which are now in man/Dockerfile.\* 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-07 11:02:51 -04:00
Vincent Demeester
a0bbf54aa7 Merge pull request #26275 from cpuguy83/verify_integration_tests 
Fail faster if integration tests don't compile
 2016-09-07 16:48:14 +02:00
Sven Dowideit
e73e37f112 Merge pull request #26218 from frosforever/fix_run_reference_typo 
Correct typo in run reference docs that use the create command
 2016-09-07 22:18:26 +10:00
Brian Goff
cb6ea5b4f5 Merge pull request #26347 from anusha-ragunathan/plugins-libnetwork 
Adding pluginv2 support for libnetwork.
 2016-09-07 08:04:34 -04:00
Vincent Demeester
0ebb18102f Merge pull request #26362 from lixiaobing10051267/masterIfconfig 
rectify some response information while execute ifconfig in container
 2016-09-07 11:25:25 +02:00
Vincent Demeester
52c55cf19b Merge pull request #26355 from stevvooe/correct-context-order 
api/client/node: correct ordering in context argument
 2016-09-07 11:23:56 +02:00
Vincent Demeester
a51fcc26fa Merge pull request #26352 from Microsoft/jjh/volumenocopydata 
Windows: Correct TestVolumesNoCopyData
 2016-09-07 11:23:10 +02:00
Antonio Murdaca
67d752ac55
support legacy registries in exernal stores 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-09-07 09:45:42 +02:00
lixiaobing10051267
97bbfc3534 rectify some response information while execute ifconfig in container 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-09-07 13:19:46 +08:00
Doug Davis
a8f79e5542 Merge pull request #26360 from lixiaobing10051267/masterServiceCreate 
remove some incorrect bash symbols
 2016-09-06 23:51:23 -04:00
lixiaobing10051267
2d1d4684f0 remove some incorrect bash symbols 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-09-07 11:44:54 +08:00
Brian Goff
a123ef1bfa Merge pull request #26340 from Microsoft/jjh/blocksinglefilevolume 
Windows: Error if mapping single file volume
 2016-09-06 21:06:15 -04:00
Brian Goff
2381c7f18d Merge pull request #26281 from LK4D4/fix_multireader_offset 
pkg/ioutils: fix multireader SEEK_CUR branch
 2016-09-06 20:47:03 -04:00
Brian Goff
6ae6739af4 Merge pull request #26344 from tophj-ibm/change-test-daemon-id-generation 
Integration-cli: change daemon id generation from time to rand
 2016-09-06 20:42:58 -04:00
Brian Goff
4d0275c819 Verify integration tests before building bundles 
Adds a new bundle `verify-integration-tests` which pre-compiles a test
binary for the integration tests.

This makes sure that the integration tests will actually compile before
doing other tasks which take much longer, such as building dockerd and
loading test fixtures.
When it comes time to actually run the tests, the pre-compiled binary
will be used so it doesn't have to compile the tests a 2nd time.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-09-06 20:27:28 -04:00
Stephen J Day
084ff6dc6d
api/client/node: correct ordering in context argument 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-09-06 17:04:43 -07:00
John Howard
8a1fdce7fe Windows: Correct TestVolumesNoCopyData 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-06 15:38:19 -07:00
Christopher Jones
42f3865d24
Integration-cli: change daemon id generation 
Fixes #24805

Changes test daemon id generation from using time.Now().UnixNano() to using
stringid. This is because of a go bug (fixed upstream for 1.8) on ppc64le
and s390x where time.Now().UnixNano() would not return nanosecond precision,
so initializing consecutive daemons sometimes would result in them having
the same id.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-09-06 18:17:24 -04:00
Tõnis Tiigi
331e724e87 Merge pull request #26310 from hqhq/cleanup_pullSchema2 
Cleanup pullSchema2
 2016-09-06 14:35:47 -07:00
Anusha Ragunathan
17b8aba1d9 Adding pluginv2 support for libnetwork (part 1) 
Legacy plugins (aka pluginv1) calls in libnetwork are replaced with
calls using the new plugin model (aka pluginv2). pkg/plugins is still
used for managing the http client connections to the plugin.

This commit makes the necessary changes in docker/docker. Part 2 will
will take care of the libnetwork changes.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-09-06 14:30:55 -07:00
Brian Goff
dc712b9249 restore migrating pre-1.7.0 volumes 
This was removed in a clean-up
(060f4ae617) but should not have been.
Fixes issues with volumes when upgrading from pre-1.7.0 daemons.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-09-06 17:17:47 -04:00
Harald Albers
d5a79579d3 Add completion for docker events -f event=health_status 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-09-06 13:46:21 -07:00
Alexander Morozov
f3627c3726 pkg/ioutils: fix multireader SEEK_CUR branch 
Before getReaderForOffset returned always nil and wrong offset.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-09-06 11:08:35 -07:00
John Howard
1b62b8c084 Windows: Error if mapping single file volume 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-06 10:52:56 -07:00
Charles Smith
75c36bcc64 Merge pull request #26288 from sfsmithcha/add_tls 
author merge: addressed @diogomonica ' remark: add how pki works topic
 2016-09-06 10:41:46 -07:00
Charles Smith
5ca3e6e61f add how pki works topic 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-09-06 10:39:52 -07:00
Phil Estes
078964177f Merge pull request #25950 from akalipetis/fix-#21738-userns-mount-create 
Host mounted directories are correctly chowned to the remapped root, if the directory does not already exist
 2016-09-06 12:42:39 -04:00