3c8d35d9dd
Deprecate "daemon" subcommand
...
The daemon is in a separate (dockerd) binary
since docker 1.12, so should no longer be
used.
This marks the command as deprecated, and
adds it to the deprecated features list.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bf58dd82c31bb3a71916eec743d0560e360c6e08
Component: engine
2016-09-23 00:26:27 +02: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
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
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
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
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
31236accf6
Windows: Remove TP5 support from volume
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6ceec828bff1663f4193ca4ffc308e4ccb962ec5
Component: engine
2016-09-21 11:03:19 -07:00
fadc0c5e00
Add Portworx Volume Plugin Description
...
Signed-off-by: Jeff Silberman <jsilberm@gmail.com >
Upstream-commit: da2159ea1c366ac64b0f498a8aca0ee595dae558
Component: engine
2016-09-21 09:24:32 -07:00
ba3ea763a4
Merge pull request #24987 from ripcurld00d/stats_format_prod
...
Add format to stats
Upstream-commit: c0699cd4a43ccc3b1e3624379e46e9ed94f7428c
Component: engine
2016-09-21 10:38:21 -04:00
38db9ff302
Merge pull request #26770 from YuPengZTE/devEG
...
'eg.' should be 'e.g.'
Upstream-commit: a7b0b6e2a9360115e9bca719f6bdb6e9d8fc3415
Component: engine
2016-09-21 10:03:23 -04:00
b9df1ee797
Merge pull request #26737 from miaoyq/del-setting-hostconfig-during-start-container
...
Modify the print and comment of setting host configuration options when the container starts
Upstream-commit: 340f50c1c4e1c0dc54f1d94b4dedf3f46db0d12b
Component: engine
2016-09-21 13:30:53 +02:00
7c1d86c305
Removed engine-api leftovers
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 45818d6fc49e6da0369a33f015967fff7417df1c
Component: engine
2016-09-21 12:36:52 +02:00
70015a6933
Merge pull request #26723 from anusha-ragunathan/volmount_win
...
Add missing call to "VolumeDriver.Mount" during container start.
Upstream-commit: fd1037b4325c1ae5b2e68d6f39ee0cd58a0a7d48
Component: engine
2016-09-21 10:28:29 +02:00
d73f6e50df
Merge pull request #26751 from Microsoft/jjh/reverthostconfig
...
Revert Box from HostConfig
Upstream-commit: b683958deeaae20463649085516d57df2fbdec53
Component: engine
2016-09-21 09:53:39 +02:00
de0192fa30
'eg.' should be 'e.g.'
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn >
Upstream-commit: 0b86bca0b5c627ebb9524ecf5295c2c91e4bd8f5
Component: engine
2016-09-21 13:48:06 +08:00
1c50565e28
Revert the fix to invalid handles due to a platform bug
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: f6d5f7b9752080981cb17052e8ab529be129e3ef
Component: engine
2016-09-20 17:31:24 -07:00
656af8fe4a
Merge pull request #26752 from icecrime/update_triage_process
...
Update triage process
Upstream-commit: 2a3205d7b770fec0eb1f8d90c5342f98a12a74a1
Component: engine
2016-09-20 23:26:56 +02:00
fe82ab0481
Merge pull request #26538 from LK4D4/update_grpc
...
Update grpc to v1.0.1-GA
Upstream-commit: 758a809f5453355c6d118271db971d90248652f5
Component: engine
2016-09-20 23:19:26 +02:00
f621a80cd1
Windows: OCI HVRuntime and LayerPaths to options
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a3aceeac50f35e2b10323087b2a1f21af45ee143
Component: engine
2016-09-20 13:51:53 -07:00
4145d55809
Merge pull request #26641 from Microsoft/jjh/aggressivenamespacing
...
Windows: OCI aggressive namespacing
Upstream-commit: 511fd4940282f4ed6df39f3c2ebc8b9a0f060c82
Component: engine
2016-09-20 13:37:41 -07:00
634d12a516
Update triage process
...
Remove `group/*` labels, and explain how milestones are managed.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 3dcb11982f250777430ffecbaf5bc936c48eccfb
Component: engine
2016-09-20 13:00:13 -07:00
87c5d52952
integration: fix flaky TestSwarmServiceWithGroup
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ef4bcf23e6d2324f15628ed3c0e8e8200593bd5f
Component: engine
2016-09-20 12:07:30 -07:00
7b0a3056fd
Revert Box from HostConfig
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 6b74e2f09dfe2627cd639d683e0896b938f38313
Component: engine
2016-09-20 12:01:04 -07:00
de2d72b5d2
Merge pull request #26645 from anusha-ragunathan/use-pluginv2-graph
...
Make graphdrivers work with pluginv2.
Upstream-commit: ef728a1641c354d246bb66f40b662ca8f5fd68c3
Component: engine
2016-09-20 10:59:33 -07:00
96b868c729
Merge pull request #25849 from darrenstahlmsft/LibcontainerdRaces
...
Lock all calls to hcsshim to prevent close races
Upstream-commit: 434887824241806f6bc0a686966245c569778c00
Component: engine
2016-09-20 10:34:54 -07:00
caffc36efd
libcontainerd: do not use failfast for events stream
...
New grpc uses failfast by default, but that code was written with other
default in mind, so just preserve it for now.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 5fb383243234dfebc468207cfd7f64eca1b7f849
Component: engine
2016-09-20 09:24:40 -07:00
53ebd11aff
vendor: update containerd and swarmkit
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: eeceb0ccc8318ecbf577147363666b959959450e
Component: engine
2016-09-20 09:24:36 -07:00
0313da09a5
Merge pull request #26720 from AkihiroSuda/fix-TestBuildApiDockerFileRemote
...
[test] Fix TestBuildApiDockerFileRemote
Upstream-commit: 6eb6eaf7181ce9a37fd9bc60422f9993aa59d3c3
Component: engine
2016-09-20 17:57:01 +02:00
f07146ebf8
Make graphdrivers work with pluginv2.
...
As part of making graphdrivers support pluginv2, a PluginGetter
interface was necessary for cleaner separation and avoiding import
cycles.
This commit creates a PluginGetter interface and makes pluginStore
implement it. Then the pluginStore object is created in the daemon
(rather than by the plugin manager) and passed to plugin init as
well as to the different subsystems (eg. graphdrivers, volumedrivers).
A side effect of this change was that some code was moved out of
experimental. This is good, since plugin support will be stable soon.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: fefea805e930a67fb6327f8e59415932861358cb
Component: engine
2016-09-20 08:49:48 -07:00
f3d4887540
Update API docs for "HostConfig.Binds"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 708892c4037e9eef6f6c25b5a3551f7779fb8868
Component: engine
2016-09-20 17:41:59 +02:00
b46d1e70d8
Merge pull request #26736 from dsheets/fix-typo-from-26061
...
Fix typo in api/types/container/host_config.go
Upstream-commit: beea098b97a160f027bd33f1afeaed30724b98af
Component: engine
2016-09-20 08:26:18 -07:00
6dc9c290b5
Merge pull request #25097 from msabansal/autosubnet
...
Fixing support for nat to choose a subnet automatically
Upstream-commit: 359742f2a9f4132e0a687bef12f19cffca4a7230
Component: engine
2016-09-20 15:23:44 +00:00
