Vincent Demeester
9e2178499a
Merge pull request #26787 from Microsoft/jjh/14375hacks
...
Windows: Remove interim build hacks from tests
2016-09-22 11:12:02 +02:00
Sebastiaan van Stijn
24fbed9a91
Merge pull request #26104 from michael-holzheu/PR-s390x-make-deb-ubuntu-xenial
...
s390x: Enable "make deb" for Ubuntu Xenial (16.04)
2016-09-22 10:39:58 +02:00
Vincent Demeester
d9aec43a16
Merge pull request #26774 from thaJeztah/remove-engine-api-leftovers
...
Remove engine-api leftovers
2016-09-22 09:39:27 +02:00
Sebastiaan van Stijn
c5f4a1ab19
Merge pull request #26413 from lixiaobing10051267/masterLabel
...
Labels info ommitted while inspecting self-defined network
2016-09-22 02:07:53 +02:00
Michael Crosby
d2bc5d6276
Merge pull request #26756 from rhvgoyal/init-rw-layer
...
layer_store: Use CreateReadWrite() for -init layer instead of Create()
2016-09-21 15:45:06 -07:00
Sebastiaan van Stijn
ca1b8b30cf
Merge pull request #26260 from mstanleyjones/26125_swarm_leave_force
...
Clarify usage of --force when used on a swarm manager
2016-09-22 00:11:32 +02:00
Sebastiaan van Stijn
9b7840bb8f
Merge pull request #26764 from darrenstahlmsft/RevertInvalidHandle
...
Revert the fix to invalid handles due to a platform bug
2016-09-21 22:47:02 +02:00
Sebastiaan van Stijn
d7eea4f11e
Merge pull request #26615 from mstanleyjones/17770_restructure_metadata_topic
...
Restructure Labels topic
2016-09-21 22:41:49 +02:00
Misty Stanley-Jones
5c4c062ffc
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>
2016-09-21 13:20:32 -07:00
Misty Stanley-Jones
7b5c3d935a
Clarify usage of --force when used on a swarm manager
...
Fixes #26125
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-21 13:05:33 -07:00
Sebastiaan van Stijn
7e6db44e2b
Merge pull request #26786 from Microsoft/jjh/vol14350
...
Windows: Remove TP5 support from volume
2016-09-21 21:23:34 +02:00
Sebastiaan van Stijn
f8df4b5c2e
Merge pull request #26788 from albers/completion-stats--format
...
Add bash completion for `docker stats --format`
2016-09-21 21:22:02 +02:00
Vincent Demeester
7e20704bf8
Merge pull request #26769 from portworx/master
...
Add Portworx description
2016-09-21 21:13:39 +02:00
Brian Goff
62faeb5d93
Merge pull request #26753 from LK4D4/fix_flaky_group_test
...
integration: fix flaky TestSwarmServiceWithGroup
2016-09-21 15:00:53 -04:00
Vivek Goyal
2508ca000e
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>
2016-09-21 14:45:25 -04:00
Harald Albers
ed0f53d7b6
Add bash completion for docker stats --format
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-09-21 20:19:14 +02:00
John Howard
b52c3ec4a4
Windows: Remove interim build hacks from tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-21 11:11:13 -07:00
John Howard
6ceec828bf
Windows: Remove TP5 support from volume
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-21 11:03:19 -07:00
Jeff Silberman
da2159ea1c
Add Portworx Volume Plugin Description
...
Signed-off-by: Jeff Silberman <jsilberm@gmail.com>
2016-09-21 09:24:32 -07:00
Daniel Nephin
c0699cd4a4
Merge pull request #24987 from ripcurld00d/stats_format_prod
...
Add format to stats
2016-09-21 10:38:21 -04:00
Brian Goff
a7b0b6e2a9
Merge pull request #26770 from YuPengZTE/devEG
...
'eg.' should be 'e.g.'
2016-09-21 10:03:23 -04:00
Vincent Demeester
340f50c1c4
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
2016-09-21 13:30:53 +02:00
Sebastiaan van Stijn
45818d6fc4
Removed engine-api leftovers
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-21 12:36:52 +02:00
Sebastiaan van Stijn
fd1037b432
Merge pull request #26723 from anusha-ragunathan/volmount_win
...
Add missing call to "VolumeDriver.Mount" during container start.
2016-09-21 10:28:29 +02:00
Antonio Murdaca
b683958dee
Merge pull request #26751 from Microsoft/jjh/reverthostconfig
...
Revert Box from HostConfig
2016-09-21 09:53:39 +02:00
YuPengZTE
0b86bca0b5
'eg.' should be 'e.g.'
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
2016-09-21 13:48:06 +08:00
Darren Stahl
f6d5f7b975
Revert the fix to invalid handles due to a platform bug
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-09-20 17:31:24 -07:00
Sebastiaan van Stijn
2a3205d7b7
Merge pull request #26752 from icecrime/update_triage_process
...
Update triage process
2016-09-20 23:26:56 +02:00
Vincent Demeester
758a809f54
Merge pull request #26538 from LK4D4/update_grpc
...
Update grpc to v1.0.1-GA
2016-09-20 23:19:26 +02:00
Tõnis Tiigi
511fd49402
Merge pull request #26641 from Microsoft/jjh/aggressivenamespacing
...
Windows: OCI aggressive namespacing
2016-09-20 13:37:41 -07:00
Arnaud Porterie (icecrime)
3dcb11982f
Update triage process
...
Remove `group/*` labels, and explain how milestones are managed.
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-09-20 13:00:13 -07:00
Alexander Morozov
ef4bcf23e6
integration: fix flaky TestSwarmServiceWithGroup
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-09-20 12:07:30 -07:00
John Howard
6b74e2f09d
Revert Box from HostConfig
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-09-20 12:01:04 -07:00
Anusha Ragunathan
ef728a1641
Merge pull request #26645 from anusha-ragunathan/use-pluginv2-graph
...
Make graphdrivers work with pluginv2.
2016-09-20 10:59:33 -07:00
John Howard
4348878242
Merge pull request #25849 from darrenstahlmsft/LibcontainerdRaces
...
Lock all calls to hcsshim to prevent close races
2016-09-20 10:34:54 -07:00
Alexander Morozov
5fb3832432
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>
2016-09-20 09:24:40 -07:00
Alexander Morozov
eeceb0ccc8
vendor: update containerd and swarmkit
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-09-20 09:24:36 -07:00
Sebastiaan van Stijn
6eb6eaf718
Merge pull request #26720 from AkihiroSuda/fix-TestBuildApiDockerFileRemote
...
[test] Fix TestBuildApiDockerFileRemote
2016-09-20 17:57:01 +02:00
Anusha Ragunathan
fefea805e9
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>
2016-09-20 08:49:48 -07:00
Sebastiaan van Stijn
a65f01052e
Merge pull request #26598 from thaJeztah/fix-binds-api-docs
...
Update API docs for "HostConfig.Binds"
2016-09-20 17:49:45 +02:00
Sebastiaan van Stijn
708892c403
Update API docs for "HostConfig.Binds"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-09-20 17:41:59 +02:00
Kenfe-Mickaël Laventure
beea098b97
Merge pull request #26736 from dsheets/fix-typo-from-26061
...
Fix typo in api/types/container/host_config.go
2016-09-20 08:26:18 -07:00
Arnaud Porterie
359742f2a9
Merge pull request #25097 from msabansal/autosubnet
...
Fixing support for nat to choose a subnet automatically
2016-09-20 15:23:44 +00:00
Alexander Morozov
e3e6d9f9d0
Merge pull request #26740 from tagomoris/update-fluent-logger-golang-1.2.0
...
Update fluent-logger-golang to v1.2.0.
2016-09-20 07:49:30 -07:00
Vincent Demeester
7a86930c74
Merge pull request #26436 from stevvooe/remove-transport-package
...
client: remove transport package
2016-09-20 16:43:56 +02:00
Vincent Demeester
6997182882
Merge pull request #26725 from StefanScherer/log-error-to-event-log
...
Windows: Write fatal error to event log if running as service
2016-09-20 16:26:21 +02:00
Akihiro Suda
f453261b4a
Fix TestBuildApiDockerFileRemote
...
TestBuildApiDockerFileRemote has been consistently failing (EPERM) on the host
with #26618 , which prohibits /sys/firmware from being accessed using apparmor.
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-20 14:15:37 +00:00
Vincent Demeester
be9e3f59e6
Merge pull request #26270 from AkihiroSuda/fix-typo-docker-images
...
[nit] fix the man page and zsh completion for `docker images`
2016-09-20 15:56:23 +02:00
Vincent Demeester
a51967cd02
Merge pull request #26716 from dnephin/move-system-commands
...
Create system subcommand
2016-09-20 15:54:01 +02:00
Brian Goff
1dded94b1b
Merge pull request #26738 from thaJeztah/remove-unused-state-functions
...
Removed unused state functions
2016-09-20 09:16:30 -04:00