Daniel Dao
84e14754e1
only close LogDriver after LogCopier is done
...
this prevents the copier from sending messages in the buffer to the closed
driver. If the copied took longer than the timeout to drain the buffer, this
aborts the copier read loop and return back so we can cleanup resources
properly.
Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
2016-01-18 17:47:57 +00:00
Tibor Vass
012a3b6e74
Merge pull request #19365 from tiborvass/bump_apiversion_to_v1.23
...
Bump API Version to v1.23
2016-01-15 10:48:15 -05:00
Tibor Vass
a0fab35fe8
Bump API Version to v1.23
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-01-15 10:44:02 -05:00
Vincent Demeester
9b63019711
Merge pull request #19234 from jdoliner/patch-1
...
Remove Pachyderm storage driver.
2016-01-15 12:48:42 +01:00
Joe Doliner
5063efb8d8
Remove Pachyderm storage driver.
...
Signed-off-by: Joe Doliner <jdoliner@gmail.com>
2016-01-15 02:06:20 -08:00
Jess Frazelle
4c89b1f72c
Merge pull request #19355 from riyazdf/notary-revendor
...
notary revendor into docker
2016-01-15 01:02:35 -08:00
Antonio Murdaca
bca9415b52
Merge pull request #19356 from sanimej/restart
...
Vendoring libnetwork v0.5.6
2016-01-15 09:32:53 +01:00
Vincent Demeester
8ce8813cdc
Merge pull request #18928 from wenchma/18626-add_subnets_info
...
Add Subnets info for user-defined network
2016-01-15 09:07:18 +01:00
Riyaz Faizullabhoy
dd7436c832
revendor notary and wrap friendlier error messages
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-01-14 20:35:59 -08:00
Sebastiaan van Stijn
c56ed85f3d
Merge pull request #19353 from calavera/coolljt0725_is_a_maintainer
...
Add Lei Jitang to MAINTAINERS.
2016-01-14 19:37:33 -08:00
David Calavera
8fc36b7f6b
Add Lei Jitang to MAINTAINERS.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-14 21:59:26 -05:00
Wen Cheng Ma
5cc672b006
Add Subnets info for user-defined network
...
* If user doesn't specify the subnets to create a network, it will pick
subnets from inside preferred pool. This PR aims to inspect these subnets info
* Add integration tests for docker inspect the subnets.
* docker-py project is already synchronized.
* jenkins checks depend on https://github.com/docker/docker-py/pull/888
Fixes issue #18626
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-15 10:03:29 +08:00
Sebastiaan van Stijn
954613fb24
Merge pull request #19122 from ajneu/master
...
documentation: debian/ubuntu need apt-transport-https ca-certificates
2016-01-14 16:53:08 -08:00
Arnaud Porterie
6add477c91
Merge pull request #19308 from estesp/better-warning-msg
...
Better warning message on OOM kill disable without mem limit
2016-01-14 16:49:38 -08:00
Sebastiaan van Stijn
e44364eae9
Merge pull request #18587 from calavera/daemon_configuration_file
...
Allow to set daemon and server configurations in a file.
2016-01-14 16:44:58 -08:00
Tibor Vass
94b2d56690
Merge pull request #19109 from BrianBland/crossRepositoryPush
...
Cross repository push
2016-01-14 18:50:53 -05:00
Jess Frazelle
4bdb440cca
Merge pull request #19332 from hypriot/update-arm-registry-notary
...
Update Dockerfile.armhf to sync changes for registry and notary
2016-01-14 14:54:12 -08:00
Sebastiaan van Stijn
9539c0a402
Merge pull request #18452 from moxiegirl/carrry-doc-17989
...
Update security docs for seccomp/apparmor
2016-01-14 14:42:37 -08:00
Arnaud Porterie
33a06a7f05
Merge pull request #19346 from albers/completion-detach-keys
...
Completion and docs update for --detach-keys
2016-01-14 14:40:44 -08:00
Brian Bland
6309947718
Changes cross-repository blob mounting to a blob Create option
...
Also renames BlobSumService to V2MetadataService, BlobSum to
V2Metadata
Signed-off-by: Brian Bland <brian.bland@docker.com>
2016-01-14 14:26:03 -08:00
Harald Albers
3bf821054e
Document that detach keys are a list of key bindings
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-14 13:58:41 -08:00
Jessica Frazelle
61553fc2f5
WIP: Update security docs for seccomp/apparmor
...
Signed-off-by: Mary Anthony <mary@docker.com>
Updaing and slight re-arrangement of security information
Signed-off-by: Mary Anthony <mary@docker.com>
Updating security files
Signed-off-by: Mary Anthony <mary@docker.com>
Updating links to the security documentation
Signed-off-by: Mary Anthony <mary@docker.com>
removing some extra spaces
Signed-off-by: Mary Anthony <mary@docker.com>
Correcting spelling
Signed-off-by: Mary Anthony <mary@docker.com>
2016-01-14 13:58:37 -08:00
Tibor Vass
9365b301a8
Merge pull request #19339 from cpuguy83/19335_revert_18736
...
Revert "Break big lock into some tiny locks"
2016-01-14 16:53:39 -05:00
Brian Goff
3b6a989d81
Merge pull request #19325 from mingqing/fix-pid-convert-error
...
fix pidfile, pid is num use '/proc + string(pid)' can't found it
2016-01-14 16:49:20 -05:00
Harald Albers
b24ded193f
bash completion for --detach-keys
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-01-14 13:47:20 -08:00
David Calavera
677a6b3506
Allow to set daemon and server configurations in a file.
...
Read configuration after flags making this the priority:
1- Apply configuration from file.
2- Apply configuration from flags.
Reload configuration when a signal is received, USR2 in Linux:
- Reload router if the debug configuration changes.
- Reload daemon labels.
- Reload cluster discovery.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-14 16:44:37 -05:00
Tibor Vass
e35f5a481a
Merge pull request #17316 from rmb938/ipam_conf_options
...
Add IPAM Config Options to match libnetwork
2016-01-14 16:30:03 -05:00
Arnaud Porterie
0f2ba97a78
Merge pull request #19343 from Microsoft/jjh/dockerfilenote
...
Add note in dockerfile about go version
2016-01-14 13:11:03 -08:00
David Calavera
d299bbfcc6
Merge pull request #19342 from Microsoft/jjh/fix19316
...
Windows: Fix test regression from 19155
2016-01-14 13:05:47 -08:00
David Calavera
db2b5e647c
Merge pull request #19338 from aboch/vnd
...
Vendoring libnetwork v0.5.5
2016-01-14 13:02:20 -08:00
Jess Frazelle
7a44265129
Merge pull request #19324 from Djelibeybi/fix-selinux-rpm-changelog
...
Remove the changelog auto-generation
2016-01-14 12:47:32 -08:00
John Howard
6c1382e151
Add note in dockerfile about go version
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-14 12:20:19 -08:00
John Howard
d3392a3bde
Windows: Fix test regression from 19155
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-14 12:00:27 -08:00
Ryan Belgrave
662cac08ef
Add IPAM Config Options to match libnetwork
...
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
2016-01-14 14:32:25 -05:00
Arnaud Porterie
3ce3fb7417
Merge pull request #19333 from wzyboy/patch-1
...
Update CHANGELOG.md
2016-01-14 11:21:32 -08:00
Madhu Venugopal
7481961009
IT for restart-policy and DNS based SD in user-defined networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-14 11:03:26 -08:00
Brian Goff
7cd6210a88
Merge pull request #19326 from HackToday/19153-filter-rethink
...
Fix image filter
2016-01-14 13:59:14 -05:00
David Calavera
73a5393bf3
Merge pull request #19242 from mavenugo/nsalias
...
Network scoped alias support
2016-01-14 10:58:51 -08:00
Santhosh Manohar
5347f7cd94
Vendoring libnetwork v0.5.6
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-01-14 10:48:48 -08:00
Brian Goff
f093e1273d
Revert "Break big lock into some tiny locks"
...
This reverts commit 1326f0cba5
.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-14 13:38:09 -05:00
Alessandro Boch
4e4ba9dd3a
Vendoring libnetwork v0.5.5
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-14 10:34:00 -08:00
David Calavera
812d95cdfb
Merge pull request #19323 from wenchma/19089-add_network_id
...
Add network ID to container inspect
2016-01-14 09:58:24 -08:00
Tibor Vass
f292e90b8d
Merge pull request #19226 from coolljt0725/remove_dup_check
...
Remove duplication checking for the existence of endpoint to speed up container starting
2016-01-14 12:24:11 -05:00
David Calavera
a225e39667
Merge pull request #19155 from coolljt0725/create_cwd_on_create
...
Create the working directory on container creation
2016-01-14 09:13:44 -08:00
David Calavera
22a81a2c58
Add an unsafe memory discovery store for testing.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-14 11:58:38 -05:00
David Calavera
1666707cf8
Vendor merge structure tool.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-14 11:58:38 -05:00
Madhu Venugopal
dda513ef65
Network scoped alias support
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-01-14 08:44:41 -08:00
Tibor Vass
349d9700bd
Merge pull request #19291 from coolljt0725/fix_19100
...
Fix #19100 and fix a typo
2016-01-14 11:40:29 -05:00
Wen Cheng Ma
9f676ade0a
Add network ID to container inspect
...
Fixes issue #19089
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-01-14 22:33:41 +08:00
Tibor Vass
59231ea6d8
Merge pull request #19312 from cpuguy83/19177_fix_debug_req_dump_size
...
Don't dump request body when too large
2016-01-14 09:06:02 -05:00