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

27069 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Michael Crosby
368a27a8d8 Merge pull request #26294 from petrsvihlik/updated-windows-mounting-example 
Updated Windows mounting example
 2016-09-06 09:05:50 -07:00
Michael Crosby
0d03c060c7 Merge pull request #26212 from rhvgoyal/xfs-enospc 
devmapper: Set xfs max_retries to 0 upon ENOSPC
 2016-09-06 09:03:09 -07:00
Vincent Demeester
da763602af Merge pull request #26307 from AkihiroSuda/fix-doc-26291 
fix docs about `sudo docker login`
 2016-09-06 17:47:46 +02:00
Vincent Demeester
d4e173fc34 Merge pull request #26258 from mstanleyjones/25625_swarm_init_return_value 
Add response to swarm/init example (fixes #25625
 2016-09-06 17:43:19 +02:00
Misty Stanley-Jones
a2a0a03e2b Add response to swarm/init example (fixes #25625 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-06 08:39:53 -07:00
Doug Davis
1c7c298d2b Merge pull request #26337 from icaoweiwei/patch_2016-09-06_1 
Remove redundant word
 2016-09-06 11:24:22 -04:00
Cao Weiwei
c6edecc2d6 Remove redundant word 
Signed-off-by: Cao Weiwei <cao.weiwei30@zte.com.cn>
 2016-09-06 23:21:41 +08:00
Vincent Demeester
5c6b54c278 Merge pull request #26282 from mstanleyjones/26280_fix_pretty_print 
`docker node inspect <node> --pretty`  needs an extra newline at the end
 2016-09-06 16:04:55 +02:00
Vincent Demeester
d8e1515350 Merge pull request #26293 from lixiaobing10051267/masterDockerAttach 
fix the wrong option info while specifying the command with the "--help"
 2016-09-06 15:44:44 +02:00
Brian Goff
778acfdf09 Merge pull request #26304 from OctopusDeploy/26178-env-vars-with-equals 
Allow windows environment variables to contain `=`
 2016-09-06 09:32:40 -04:00
Brian Goff
3dd6e38b08 Merge pull request #26328 from allencloud/correct-docker-volume-ls-description 
correct docker volume ls subcommand description
 2016-09-06 09:26:09 -04:00
allencloud
2087f94df5 correct docker volume ls subcommand description 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-09-06 17:18:41 +08:00
Vincent Demeester
1325cde252 Merge pull request #26313 from yongtang/26312-network-ls-help-output-volume 
Fix incorrect help output in `docker network ls`
 2016-09-05 19:13:09 +02:00
Vincent Demeester
d7594d23c8 Merge pull request #26320 from yongtang/09052016-man-docker-create 
Update man page for `docker create` to add `--rm` flag
 2016-09-05 18:40:07 +02:00
Yong Tang
6ac8224207 Update man page for docker create to add --rm flag 
The `--rm` flag has been part of the `docker create` and
related docs in `docs/reference/commandline/create.md`
already includes the `--rm` flag. However, man page
`man/docker-create.1.md` has not adds the `--rm` flag yet.

This fix adds the description of `--rm` flag to
`man/docker-create.1.md`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-05 08:38:32 -07:00
Yong Tang
b9e46235fa Fix incorrect help output in docker network ls 
As is raised in 26312, in `docker network ls`, the help output was
mistaken to `volume names`:
```
-q, --quiet Only display volume names
```

This fix changes the help output to:
```
-q, --quiet Only display network IDs
```

This fix also updates the documentation in:
`docs/reference/commandline/network_ls.md`

This fix fixes 26312.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-05 08:24:22 -07:00
Vincent Demeester
175188d8b0 Merge pull request #26292 from lixiaobing10051267/masterDockerPull 
modify output info for docker pull centos
 2016-09-05 15:44:01 +02:00
Sven Dowideit
8f424f7774 Merge pull request #26314 from unclejack/docs_contiv_nfs 
docs: mention NFS support for Contiv volume plugin
 2016-09-05 21:51:42 +10:00
unclejack
9fbe0f2156 Merge pull request #26199 from bamarni/raspbian-overlay 
remove systemd drop-in unit on raspbian
 2016-09-05 04:45:47 -07:00
Vincent Demeester
1145c9b0d5 Merge pull request #26233 from yuexiao-wang/fix-readme 
Fix readme doc for dockerd
 2016-09-05 13:39:19 +02:00
Antonis Kalipetis
c6bff578b4
Add test for checking created directories on remapped root 
Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
 2016-09-05 13:02:13 +03:00
Antonis Kalipetis
72d8a77d52
Make host directory mounts use idtools.MkdirAllNewAs 
This makes sure that:
1. Already existing directories are left untouched
2. Newly created directories are chowned to the correct root UID/GID in case of user namespaces
3. All parent directories still get created with host root UID/GID

Fix #21738

Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
 2016-09-05 12:46:57 +03:00
unclejack
faaccf26e3 docs: mention NFS support for contiv volume plugin 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2016-09-05 12:38:50 +03:00
Vincent Demeester
01fe5639bc Merge pull request #26236 from yuexiao-wang/remove-h-option 
Remove -h option for docker cli
 2016-09-05 09:52:18 +02:00
Qiang Huang
cec0e2dfbd Cleanup pullSchema2 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-09-05 15:02:14 +08:00