f557e61a5e
change-code-and-fix-docs-about-checkpoint
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 9b4ba34d046fc9fd65fc060af016d2b2b9b95957
Component: engine
2016-09-23 19:37:43 +08:00
a0b2adc110
Merge pull request #26516 from yongtang/26453-build-bad-syntax
...
Check bad syntax on dockerfile before building.
Upstream-commit: 72f556a9ff1043a4188e8eeef892d8a0ba4fe34f
Component: engine
2016-09-23 12:24:20 +02:00
71ee663490
Merge pull request #26854 from lixiaobing10051267/masterNetworkID
...
the network id is not consistant with the real id created
Upstream-commit: b0671fdc0b0a909966e0d11a50492cb71f114b50
Component: engine
2016-09-23 11:29:02 +02:00
a045d7b33b
the network id is not consistant with the real id created
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 392aae44fd8ea5755305104e1c2a1c85f39d4a07
Component: engine
2016-09-23 17:40:55 +08:00
f04a024adb
Merge pull request #26803 from YuPengZTE/devFirstLetter
...
Capitalizes the first letter in notes of dockerfile
Upstream-commit: a94067c07fbfa77cdc57aa33c2fe2270cabb9ca3
Component: engine
2016-09-23 04:27:52 -05:00
29a3433f96
Merge pull request #26805 from miaoyq/refactor-allocateNetwork
...
Replace two array with a map type, make it easier to understand.
Upstream-commit: 8643903e49c2d25272e59fe09a75803aa05ed841
Component: engine
2016-09-23 10:15:37 +02:00
89f68050aa
Merge pull request #26850 from YuPengZTE/devDot
...
Del the extra dot
Upstream-commit: a70e6dfe80c8b224b1df4510a3729c9a2c1d249e
Component: engine
2016-09-23 10:10:11 +02:00
69f06771c4
Merge pull request #26299 from allencloud/support-docker-node-ps-multi-nodes
...
support docker node ps multiNodes
Upstream-commit: c03c80b1b03f3a061072af07d6d1fb811f29a9e3
Component: engine
2016-09-23 09:50:24 +02:00
d9ba2cf275
Del the extra dot
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: 73770c00fc322929215108a44049e51f1d89cae5
Component: engine
2016-09-23 15:22:52 +08:00
1534d985c8
Merge pull request #26813 from Starefossen/patch-2
...
docs: add missing 'on' in Oracle installation guide
Upstream-commit: 7a789c52059e2ebb9f03a9ba7f7af47ff315a23e
Component: engine
2016-09-23 09:14:59 +02:00
3abdd760e4
Merge pull request #26836 from thaJeztah/update-exec-api-docs
...
Add missing API docs for "privileged" and "user" exec
Upstream-commit: 9803d4736f79f2b78434699f6d162a8bbacd447f
Component: engine
2016-09-23 08:59:18 +02:00
0afb3aa46c
Merge pull request #25987 from msabansal/dnssupport
...
Support for Windows service discovery
Upstream-commit: d3139fc84af390142341a29d3512462d1a449045
Component: engine
2016-09-22 20:56:03 -07:00
792dff1fb0
Replace two array with a map type, make it easier to understand.
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 1989b1b58cc8c416e430a1fd824626b259dab5f6
Component: engine
2016-09-23 09:52:05 +08:00
d08760316a
Capitalizes the first letter in notes of dockerfile
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: bd31b24336ff2da098e62a375552586434a012b0
Component: engine
2016-09-23 09:20:27 +08:00
e7ceeb1efb
Merge pull request #26287 from msabansal/composefix
...
Fixed support for docker compose by allowing connect/disconnect on stopped containers
Upstream-commit: 9896fa356c39faafb79ce2efe3550d498eb5d1fa
Component: engine
2016-09-22 18:09:51 -07:00
f3693fc179
Merge pull request #26820 from lixiaobing10051267/masterAddress
...
modify the developer certificate info of origin
Upstream-commit: 6c500c00d2b730d4990e5204d4af4679fa655982
Component: engine
2016-09-23 01:55:40 +02:00
b4a97d150a
Add missing API docs for "privileged" and "user" exec
...
The "user" feature was added in docker 1.7.0, and
"privileged" feature was added in docker 1.9.0
only contained CLI docs.
This adds the missing API docs.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c53efdf4c1f0b2e7f1fe04294d9d64401b8b09b8
Component: engine
2016-09-22 23:40:05 +02:00
9e4c8c252a
Update documentation and change log to include the preliminary validation of dockerfile.
...
This commit updates documentation and change log to include
the preliminary validation of the dockerfile before instructions
in dockerfile is run one-by-one.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: e33dea5b40a52c5dcda682a1a292584ae6bff00d
Component: engine
2016-09-22 14:33:37 -07:00
d0e1a655cb
Merge pull request #26827 from Microsoft/jjh/hardcodingbaseimage
...
Windows: Remove hard coded base image in TestBuildCopyFileWithWhitespace
Upstream-commit: d6bb37060256c94158c83dc9216f08fcd4127a83
Component: engine
2016-09-22 16:29:38 -04:00
d8c41a1861
Merge pull request #26814 from p4l1ly/master
...
overlayfs added to FsNames
Upstream-commit: 5fa48f2e406b3979cda9bd3b29f77bf68fe9e61b
Component: engine
2016-09-22 16:26:46 -04:00
956358039b
Vendoring dependencies
...
Signed-off-by: msabansal <sabansal@microsoft.com >
Upstream-commit: 522930cfb3a9786d6c730e92068ea5b2656cabb0
Component: engine
2016-09-22 12:21:28 -07:00
6bf922c44e
Changes required to support windows service discovery
...
Signed-off-by: msabansal <sabansal@microsoft.com >
Upstream-commit: d1e0a78614d4efa768c88c9db3868bc9e7782efc
Component: engine
2016-09-22 12:21:21 -07:00
c0c81b997f
Merge pull request #26677 from Microsoft/jjh/networkendpointlist
...
Windows OCI: Remove endpoint list
Upstream-commit: dc8631ea53ddebf8e1c09ef95c21a9d739a6a385
Component: engine
2016-09-22 11:36:25 -07:00
809e58fdc4
Merge pull request #26796 from Microsoft/jjh/race-lcd-si
...
Windows: Data race in libcontainerd (si)
Upstream-commit: 221d4fca0cc2b2b87556b459fea8342aeb271a81
Component: engine
2016-09-22 19:44:17 +02:00
debe74e333
Windows OCI: Remove endpoint list
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 410a8612f481e67265ce0edaf78ed1d96f6dffcf
Component: engine
2016-09-22 10:08:13 -07:00
d129fb411b
Windows: Remove hard coded base image
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 34fe27f153386d07509fc7bb8363d0166ef9cda3
Component: engine
2016-09-22 09:57:35 -07:00
7195c6a9d6
Merge pull request #26746 from Microsoft/jjh/hvruntime
...
Windows: OCI HVRuntime and LayerPaths to options
Upstream-commit: 3990f2816250cba4d48a867eccdc86712d0990b2
Component: engine
2016-09-22 09:55:58 -07:00
7f3c51ecba
modify the developer certificate info of origin
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 6cd2502030930d96ee2cf60cc7c63042d39159ad
Component: engine
2016-09-23 00:17:25 +08:00
3430482576
Merge pull request #26809 from jchorl/master
...
Move /x/net/context to context in docker client README
Upstream-commit: 2526ae37e98936451dcfb47b76bc851b9fabfb4a
Component: engine
2016-09-22 14:25:54 +01:00
d36b90b866
overlayfs added to FsNames
...
Signed-off-by: Pavol Vargovcik <pallly.vargovcik@gmail.com >
Upstream-commit: fe5c91c388e2cd98720a6804b7c637cb21870933
Component: engine
2016-09-22 14:35:40 +02:00
15482db5bf
docs: add missing 'on' in Oracle installation guide
...
Signed-off-by: Hans Kristian Flaatten <hans.flaatten@evry.com >
Upstream-commit: 838fe65e5332dd79f5cf8551d70906d9801f79fb
Component: engine
2016-09-22 14:34:25 +02:00
35d40c539a
Move /x/net/context to context in docker client README
...
Signed-off-by: Josh Chorlton <jchorlton@gmail.com >
Upstream-commit: a98d957942e09a462e83d0b9a8a279acd3cd1ea1
Component: engine
2016-09-22 18:45:23 +08:00
46015b068c
Merge pull request #26787 from Microsoft/jjh/14375hacks
...
Windows: Remove interim build hacks from tests
Upstream-commit: 9e2178499abb7cc81420a4e9e8f993618a48072f
Component: engine
2016-09-22 11:12:02 +02:00
fa0da9e5eb
Merge pull request #26104 from michael-holzheu/PR-s390x-make-deb-ubuntu-xenial
...
s390x: Enable "make deb" for Ubuntu Xenial (16.04)
Upstream-commit: 24fbed9a916aa8a8ea8692a4ba5ce2956ebb2b37
Component: engine
2016-09-22 10:39:58 +02:00
6b6c0bf977
Merge pull request #26774 from thaJeztah/remove-engine-api-leftovers
...
Remove engine-api leftovers
Upstream-commit: d9aec43a16bb62f4804c78c8d368918a2fbcdbfb
Component: engine
2016-09-22 09:39:27 +02:00
ad119a9fca
Merge pull request #26413 from lixiaobing10051267/masterLabel
...
Labels info ommitted while inspecting self-defined network
Upstream-commit: c5f4a1ab1947d4c9084e1849db77594886b8fe95
Component: engine
2016-09-22 02:07:53 +02:00
894b99ac52
Merge pull request #26756 from rhvgoyal/init-rw-layer
...
layer_store: Use CreateReadWrite() for -init layer instead of Create()
Upstream-commit: d2bc5d62761c24866e4b0ff4099dd54264bd9325
Component: engine
2016-09-21 15:45:06 -07:00
50d424be1a
Merge pull request #26260 from mstanleyjones/26125_swarm_leave_force
...
Clarify usage of --force when used on a swarm manager
Upstream-commit: ca1b8b30cf569cd0fb4860ec023a8328edc0a769
Component: engine
2016-09-22 00:11:32 +02:00
05ab8e37e3
Windows: Data race in libcontainerd (si)
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: c2499dff6433105024c9434c652731087f32892c
Component: engine
2016-09-21 14:36:51 -07:00
7870978104
Merge pull request #26764 from darrenstahlmsft/RevertInvalidHandle
...
Revert the fix to invalid handles due to a platform bug
Upstream-commit: 9b7840bb8fb6adaf609f507e0da3fcc1bfc947a7
Component: engine
2016-09-21 22:47:02 +02:00
51c529dd35
Fixed support for docker compose by allowing connect/disconnect on stopped containers
...
Signed-off-by: msabansal <sabansal@microsoft.com >
Upstream-commit: 50f02b585c6e5866cf458c7f91a2e99e82ea9a2d
Component: engine
2016-09-21 13:29:17 -07:00
1f178ade70
Restructure content about Docker object labels
...
A few points of work:
- Took the topic out of the left-hand nav and made it
reachable from the User guide intro
- Condensed the topic's contents, presenting only conceptual
info and pointing instead to the command-line references
for each type of object
- Added brief information about the `LABELS` keyword to the
Dockerfile reference
A big part of the point is to establish a pattern of
thinking and use around how Docker uses labels and what they
mean in different contexts.
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 5c4c062ffcdb8d7b8c104fd667571279c51d2ffd
Component: engine
2016-09-21 13:20:32 -07:00
0eb9a616d1
Clarify usage of --force when used on a swarm manager
...
Fixes #26125
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 7b5c3d935a7a99b282f0f859101c887894a0b00e
Component: engine
2016-09-21 13:05:33 -07:00
7db50d1196
Merge pull request #26786 from Microsoft/jjh/vol14350
...
Windows: Remove TP5 support from volume
Upstream-commit: 7e6db44e2b5ae54d54a653e050a669c1f56f3ff8
Component: engine
2016-09-21 21:23:34 +02:00
e3368b42d2
Merge pull request #26788 from albers/completion-stats--format
...
Add bash completion for `docker stats --format`
Upstream-commit: f8df4b5c2e2d8a61d605e91a9c77e1af5557bf65
Component: engine
2016-09-21 21:22:02 +02:00
15cdd422af
Merge pull request #26769 from portworx/master
...
Add Portworx description
Upstream-commit: 7e20704bf84ad47663ffe66d2c4c6f1c5116dd9d
Component: engine
2016-09-21 21:13:39 +02:00
a6f0bebbca
Merge pull request #26753 from LK4D4/fix_flaky_group_test
...
integration: fix flaky TestSwarmServiceWithGroup
Upstream-commit: 62faeb5d93b036a4f4ff6bbade3c99930bff1ad9
Component: engine
2016-09-21 15:00:53 -04:00
952f960124
layer_store: Use CreateReadWrite() for -init layer instead of Create()
...
init layer is read/write layer and not read only layer. Following commit
introduced new graph driver method CreateReadWrite.
ef5bfad Adding readOnly parameter to graphdriver Create method
So far only windows seem to be differentiating between above two methods.
Making this change to make sure -init layer calls right method so that
we don't have surprises in future.
Windows does not need init layer. This patch also gets rid of creation of
init layer on windows.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 2508ca000e79dfe1a956b0078a0d196dd6b66dab
Component: engine
2016-09-21 14:45:25 -04:00
4d0761852a
Add bash completion for docker stats --format
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ed0f53d7b6c64044a02e65251e92e7cac7f41c14
Component: engine
2016-09-21 20:19:14 +02:00
91744d608c
Windows: Remove interim build hacks from tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b52c3ec4a45ee89d8ad713a16566fd470b4b5bf1
Component: engine
2016-09-21 11:11:13 -07:00
