Commit Graph

19549 Commits

Author SHA1 Message Date
Shuwei Hao
11062ea177 Fixing wrong word spelling in api/client/network.go
Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com>
2015-11-04 13:42:34 +00:00
Antonio Murdaca
0f41761290 Merge pull request #17672 from LK4D4/unn_var
Remove unnecessary var decls
2015-11-04 12:24:52 +01:00
Alexander Morozov
cec31abfea Remove unnecessary var decls
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-03 17:03:40 -08:00
Brian Goff
c9208953fa Merge pull request #17630 from LK4D4/syscall_umount_warn
Do not ignore error from syscall.Unmount
2015-11-03 19:58:19 -05:00
Jess Frazelle
562a1263f2 Merge pull request #17665 from LK4D4/setupwd_refactor
Reorder code slightly in setupWorkingDirectory
2015-11-03 15:56:10 -08:00
Jess Frazelle
e704182c9c Merge pull request #17614 from LK4D4/fix_golint
Update linting tools to latest versions
2015-11-03 15:32:12 -08:00
Alexander Morozov
bb66c16871 Reorder code slightly in setupWorkingDirectory
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-03 14:33:31 -08:00
Sebastiaan van Stijn
67630bef47 Merge pull request #17649 from rsmoorthy/rsmoorthy-patch-1
volume plugin doc update
2015-11-03 23:33:20 +01:00
David Calavera
65ffd917c6 Merge pull request #17663 from tiborvass/merge_release_v1.9.0
Merge release v1.9.0
2015-11-03 13:40:37 -08:00
Tibor Vass
78f8a1224c Change version to 1.10.0-dev
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-11-03 16:17:07 -05:00
Tibor Vass
8b0e32b151 Bump version to v1.9.0
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-11-03 15:08:56 -05:00
Antonio Murdaca
474b16af8e Merge pull request #17659 from cpuguy83/17646_keep_em_running
Fix network settings inspect tests
2015-11-03 20:25:01 +01:00
Brian Goff
c30b9e590c Merge pull request #17606 from mountkin/increase-max-retries
increase the maxJSONDecodeRetry in json log reader
2015-11-03 13:45:45 -05:00
Michael Crosby
aff8bd178c Merge pull request #17638 from calavera/move_net_stats_collector
Make the stats collector to collect network stats.
2015-11-03 10:31:40 -08:00
Brian Goff
3564895e84 Fix network settings inspect tests
Makes sure the containers are actually running when inspecting so the
ip info is actually populated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-03 12:12:19 -05:00
moxiegirl
49f55b273b Merge pull request #17658 from moxiegirl/incorporate-madhu-comments
Updating networking docs with technical information
2015-11-03 08:44:07 -08:00
Madhu Venugopal
39dfc536d4 Updating networking docs with technical information
- the /etc/hosts read caveat due to dynamic update
- information about docker_gwbridge
- Carries and closes #17654
- Updating with last change by Madhu
- Updating with the IPAM api 1.22

Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-03 08:42:40 -08:00
David Calavera
8d5695470a Merge pull request #17629 from tonistiigi/kill-autorestart-fix
Fix race causing autorestart turning off on restart
2015-11-03 08:24:11 -08:00
Sebastiaan van Stijn
43ae13742d Merge pull request #17650 from thaJeztah/fix-api-network-output
docs: update remote API responses and minor fixes
2015-11-03 16:09:01 +01:00
Sebastiaan van Stijn
d3b2e7dcf4 Merge pull request #17652 from moxiegirl/nigel-credits
Nigel acknowledgement
2015-11-03 15:35:53 +01:00
Sebastiaan van Stijn
286fe69d53 docs: update remote API responses and minor fixes
Add back the "old" networksettings fields that were removed,
but added back to maintain backward compatibility, in
https://github.com/docker/docker/pull/17538

Update network endpoint responses, with updated response
introduced in;
https://github.com/docker/docker/pull/17536

Added changes to v1.22 that were applied to the v1.21 / v1.20 docs
after the API bump(s);

https://github.com/docker/docker/pull/17085
https://github.com/docker/docker/pull/17127
https://github.com/docker/docker/pull/13707

Also fixed some mixed tab/spaces indentation
and Markdown formatting issues (causing code-blocks to
be rendered incorrectly)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-03 15:24:31 +01:00
Mary Anthony
7b978cc378 Nigel acknowledgement
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-03 05:52:33 -08:00
Sebastiaan van Stijn
43ad218293 Merge pull request #17651 from moxiegirl/nathans-tweaks
Fixing ZooKeeper and some other nits Nathan found
2015-11-03 14:40:11 +01:00
Mary Anthony
0f1083c8da Fixing ZooKeeper and some other nits Nathan found
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-03 05:34:54 -08:00
Sebastiaan van Stijn
578f4e129e Merge pull request #17242 from jlebon/pr/makefile-no-tty
Makefile: don't allocate pseudo-tty if not interactive
2015-11-03 13:10:31 +01:00
rsmoorthy
4d9b8bae25 multiple mount/unmount req with same volume name
Updating docs to handle mount/unmount requests with same volume name. Issue #17585

Signed-off-by: Moorthy RS <rsmoorthy@gmail.com>
2015-11-03 16:33:20 +05:30
moxiegirl
05a4cb2221 Merge pull request #17486 from moxiegirl/16286-storage-drivers
Improved Storage Driver Documentation
2015-11-02 21:42:03 -08:00
Mary Anthony
950fbf99b1 Add special memory management file
updating after assignment for Nigel
Adding in some notes from Nigel work
Updating with the storage driver content Nigel added
Updating with Nigel's polishing tech
Adding in Nigel graphics
First pass of aufs material
Capturing Nigel's latest
Comments back to Nigel on devicemapper
Incorporating Nigel's comments v3
Converting images for dm
Entering comments into aufs page
Adding the btfs storage driver
Moving to userguide
Adding in two new driver articles from Nigel
Optimized images
Updating with comments

Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-02 21:40:18 -08:00
moxiegirl
43077f9b64 Merge pull request #17340 from moxiegirl/new-networking-docs
Network docs for release
2015-11-02 21:16:41 -08:00
Mary Anthony
9ef855f9e5 First pass at consolidating
Removing old networking.md
Updating dockernetworks.md with images
Adding information on network plugins
Adding blurb about links to docker networking
Updating the working documentation
Adding Overlay Getting Started
Downplaying links by removing refs/examples, adding refs/examples for network.
Updating getting started to reflect networks not links
Pulling out old network material
Updating per discussion with Madhu to add Default docs section
Updating with bridge default
Fix bad merge
Updating with new cluster-advertise behavior
Update working and NetworkSettings examples
Correcting example for default bridge discovery behavior
Entering comments
Fixing broken Markdown Syntax
Updating with comments
Updating all the links

Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-02 21:14:55 -08:00
Alexander Morozov
3c695d7ed7 Merge pull request #17634 from stevvooe/avoid-panic-on-flush
Avoid panic on write after close in http
2015-11-02 21:11:52 -08:00
Tonis Tiigi
b8aaa4b07c Fix race causing autorestart turning off on restart
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-11-02 18:37:55 -08:00
Stephen J Day
ec2289b2d9 Avoid panic on write after close in http
By adding a (*WriteFlusher).Close, we limit the Write calls to possibly
deallocated http response buffers to the lifetime of an http request.
Typically, this is seen as a very confusing panic, the cause is usually a
situation where an http.ResponseWriter is held after request completion. We
avoid the panic by disallowing further writes to the response writer after the
request is completed.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-11-02 18:14:43 -08:00
Tibor Vass
4eac6d4529 Merge pull request #17633 from tiborvass/skip-loadimage-error-onrestore
Do not stop daemon from booting if io.EOF on loading image
2015-11-02 21:10:27 -05:00
Tibor Vass
27c2368599 Do not stop daemon from booting if io.EOF on loading image
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-11-02 21:07:28 -05:00
David Calavera
453473d6a9 Make the stats collector to collect network stats.
Currently, we get the network stats each time per subscriber, causing a
high load of cpu when there are several subscribers per container.

This change makes the daemon to collect once and publish N times, where N is the
number of subscribers per container.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-02 21:06:44 -05:00
Doug Davis
c90125dc8a Merge pull request #17637 from aaronlehmann/network-test-name-typo
Fix typo in name of integration test TestInspectApiMultipeNetworks
2015-11-02 20:42:36 -05:00
Brian Goff
c6c7d5870c Merge pull request #17635 from MHBauer/volume-backend
create generic backend to cut dependency on daemon
2015-11-02 20:31:46 -05:00
Aaron Lehmann
701e5dfe8a Fix typo in name of integration test TestInspectApiMultipeNetworks
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-11-02 17:30:16 -08:00
Morgan Bauer
836df9c446 create generic backend to cut dependency on daemon
- create a volume-specific interface that for the methods of daemon
   that are used
 - remove dependency on daemon package by volume package of server
 - like 5087977fc1

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-11-02 16:29:16 -08:00
David Calavera
79d47c5b96 Merge pull request #17628 from LK4D4/umount_log_err
Log error from unmountVolumes on cleanup
2015-11-02 15:38:32 -08:00
David Calavera
65cbf37bf7 Merge pull request #17626 from mavenugo/ith
IT for ungraceful daemon restart with multiple host-mode containers
2015-11-02 15:38:14 -08:00
Doug Davis
6d5e47a690 Merge pull request #17517 from MHBauer/network-impl
create generic backend to cut dependency on daemon
2015-11-02 17:54:28 -05:00
Alexander Morozov
3f10bdf100 Do not ignore error from syscall.Unmount
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 14:40:29 -08:00
Derek McGowan
6964f42350 Merge pull request #17557 from aaronlehmann/update-distribution
Vendor updated version of docker/distribution
2015-11-02 14:37:04 -08:00
David Calavera
642a1f67b6 Merge pull request #17573 from Microsoft/10662-parsersos
Windows: Fix unit tests parsers\os
2015-11-02 14:31:09 -08:00
Alexander Morozov
944ea3134d Merge pull request #17554 from calavera/warm_ipc_unmounts
Turn IPC unmount errors into warnings.
2015-11-02 14:25:39 -08:00
Alexander Morozov
a20fea1823 Log error from unmountVolumes on cleanup
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-02 14:11:42 -08:00
Madhu Venugopal
b323e3df8b IT for ungraceful daemon restart with multiple host-mode containers
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-11-02 14:00:11 -08:00
Aaron Lehmann
257c59251b Vendor updated version of docker/distribution
This updates the vendored docker/distribution to the current master
branch.

Note the following changes:

- The manifest package was split into manifest/schema1. Most references
  to the manifest package in the engine needed to be updated to use
  schema1 instead.

- Validation functions in api/v2 were replaced by the
  distribution/reference package. The engine code has been updated to
  use the reference package for validation where necessary. A future PR
  will change the engine to use the types defined in
  distribution/reference more comprehensively.

- The reference package explicitly allows double _ characters in
  repository names. registry_test.go was updated for this.

- TestPullFailsWithAlteredManifest was corrupting the manifest JSON, now
  that the schema1 package unmarshals the correct payload. The test is
  being changed to modify the JSON without affecting its length, which
  allows the pull to succeed to the point where digest validation
  happens.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-11-02 12:40:18 -08:00