Commit Graph

18223 Commits

Author SHA1 Message Date
3a2fac0632 Merge pull request #17649 from rsmoorthy/rsmoorthy-patch-1
volume plugin doc update
Upstream-commit: 67630bef478dd6818e6e02f0c67b60ab935025c0
Component: engine
2015-11-03 23:33:20 +01:00
164c809394 Change version to 1.10.0-dev
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 78f8a1224ce9adc994fb6d355a294e8e6fa9d455
Component: engine
2015-11-03 16:17:07 -05:00
8bc59d5e5d Bump version to v1.9.0
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 8b0e32b151e1043ef569f8877d213f89a930fa0f
Component: engine
2015-11-03 15:08:56 -05:00
62279c0cea Merge pull request #17659 from cpuguy83/17646_keep_em_running
Fix network settings inspect tests
Upstream-commit: 474b16af8ecfe94ec635dfac60025348d3186aa3
Component: engine
2015-11-03 20:25:01 +01:00
c5e6963259 Merge pull request #17606 from mountkin/increase-max-retries
increase the maxJSONDecodeRetry in json log reader
Upstream-commit: c30b9e590c69a01ee6ea0510142fb9f965b62f7a
Component: engine
2015-11-03 13:45:45 -05:00
eb4200c1ba Merge pull request #17638 from calavera/move_net_stats_collector
Make the stats collector to collect network stats.
Upstream-commit: aff8bd178c048780fa221e65a9dcce28b9c96df9
Component: engine
2015-11-03 10:31:40 -08:00
a7c60eca63 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>
Upstream-commit: 3564895e84278311ecafaab923f5f753aba32aba
Component: engine
2015-11-03 12:12:19 -05:00
b768870c71 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>
Upstream-commit: 39dfc536d444df8745124ffa38504241a0a985f7
Component: engine
2015-11-03 08:42:40 -08:00
56e28325cd Merge pull request #17629 from tonistiigi/kill-autorestart-fix
Fix race causing autorestart turning off on restart
Upstream-commit: 8d5695470ae909d0abb62e10f41c6e5f342520cd
Component: engine
2015-11-03 08:24:11 -08:00
471dae2a92 Merge pull request #17650 from thaJeztah/fix-api-network-output
docs: update remote API responses and minor fixes
Upstream-commit: 43ae13742d88cdbe9f512f83347533e0ae143c0c
Component: engine
2015-11-03 16:09:01 +01:00
342156922a Merge pull request #17652 from moxiegirl/nigel-credits
Nigel acknowledgement
Upstream-commit: d3b2e7dcf4991bf812cb329119420f03356aaa1a
Component: engine
2015-11-03 15:35:53 +01:00
6f36892ab1 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>
Upstream-commit: 286fe69d5376add77dc31833dc3c2fcc9639dd17
Component: engine
2015-11-03 15:24:31 +01:00
f345c4165c Nigel acknowledgement
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7b978cc3781758cfc12259a5259665ba5e822a84
Component: engine
2015-11-03 05:52:33 -08:00
f259c60206 Fixing ZooKeeper and some other nits Nathan found
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 0f1083c8dacb2ad189ccc4e4779c7e2dd054cb6b
Component: engine
2015-11-03 05:34:54 -08:00
5faf97bae1 Merge pull request #17242 from jlebon/pr/makefile-no-tty
Makefile: don't allocate pseudo-tty if not interactive
Upstream-commit: 578f4e129e9879cea6c6fc6885b7b47a6c462030
Component: engine
2015-11-03 13:10:31 +01:00
b5c85683eb 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>
Upstream-commit: 4d9b8bae25a89e3def7166d260b45f9c9e78ba9a
Component: engine
2015-11-03 16:33:20 +05:30
6dcf9b9560 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>
Upstream-commit: 950fbf99b1214e77c0dcc27e8f9a16e01b2c630a
Component: engine
2015-11-02 21:40:18 -08:00
687c87aa4d Merge pull request #17340 from moxiegirl/new-networking-docs
Network docs for release
Upstream-commit: 43077f9b6406e3d5e401a361b4c9742c00be528b
Component: engine
2015-11-02 21:16:41 -08:00
ecd671294f 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>
Upstream-commit: 9ef855f9e5fa8077468bda5ce43155318c58e60e
Component: engine
2015-11-02 21:14:55 -08:00
71e9a8abba Merge pull request #17634 from stevvooe/avoid-panic-on-flush
Avoid panic on write after close in http
Upstream-commit: 3c695d7ed73e9992fba51a9d4bfa745763230c79
Component: engine
2015-11-02 21:11:52 -08:00
0c95e3cdf7 Fix race causing autorestart turning off on restart
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b8aaa4b07c100a338136be82292289a37b09b5e7
Component: engine
2015-11-02 18:37:55 -08:00
c45875750d 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>
Upstream-commit: ec2289b2d9ac79fd5e0f69f56f023dfe8ee78bf8
Component: engine
2015-11-02 18:14:43 -08:00
78d86a019c Merge pull request #17633 from tiborvass/skip-loadimage-error-onrestore
Do not stop daemon from booting if io.EOF on loading image
Upstream-commit: 4eac6d4529961e0937a9e1478dd70bdc90e78260
Component: engine
2015-11-02 21:10:27 -05:00
d352f036c3 Do not stop daemon from booting if io.EOF on loading image
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 27c23685993ba4252d2d0f8f7ffa6455fb6235c5
Component: engine
2015-11-02 21:07:28 -05:00
24e41f974f 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>
Upstream-commit: 453473d6a964e58f4a61599bd90d62d0088f0cc2
Component: engine
2015-11-02 21:06:44 -05:00
3e428b6f0a Merge pull request #17637 from aaronlehmann/network-test-name-typo
Fix typo in name of integration test TestInspectApiMultipeNetworks
Upstream-commit: c90125dc8aef413a21792804748754abb2785229
Component: engine
2015-11-02 20:42:36 -05:00
915d3a3c5d Merge pull request #17635 from MHBauer/volume-backend
create generic backend to cut dependency on daemon
Upstream-commit: c6c7d5870c8fcc9c569455e6fe340c5db070a4a5
Component: engine
2015-11-02 20:31:46 -05:00
8b4073166b Fix typo in name of integration test TestInspectApiMultipeNetworks
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 701e5dfe8aa4d3d964e375911a334674c5e5480a
Component: engine
2015-11-02 17:30:16 -08:00
114ad6dae4 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 5087977fc1a4279be55f25e0b8782c9cf9bc65f3

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 836df9c4469db89ba2fecfe512ce67003a61cc1e
Component: engine
2015-11-02 16:29:16 -08:00
2f6185bd11 Merge pull request #17628 from LK4D4/umount_log_err
Log error from unmountVolumes on cleanup
Upstream-commit: 79d47c5b96c18c4497c0669c343fa05517ea3caa
Component: engine
2015-11-02 15:38:32 -08:00
371255bc1d Merge pull request #17626 from mavenugo/ith
IT for ungraceful daemon restart with multiple host-mode containers
Upstream-commit: 65cbf37bf7cfb824d6b090c78fd1d3e48af9e8d2
Component: engine
2015-11-02 15:38:14 -08:00
f577142608 Merge pull request #17517 from MHBauer/network-impl
create generic backend to cut dependency on daemon 
Upstream-commit: 6d5e47a690fe6da233bf4b76a84a728024e3794f
Component: engine
2015-11-02 17:54:28 -05:00
e8b4f63208 Merge pull request #17557 from aaronlehmann/update-distribution
Vendor updated version of docker/distribution
Upstream-commit: 6964f4235035c5e94f6a0c35149783e910fed313
Component: engine
2015-11-02 14:37:04 -08:00
8be7ad093d Merge pull request #17573 from Microsoft/10662-parsersos
Windows: Fix unit tests parsers\os
Upstream-commit: 642a1f67b6ec449110c52e3b57f968c868e91950
Component: engine
2015-11-02 14:31:09 -08:00
9400b9a7bc Merge pull request #17554 from calavera/warm_ipc_unmounts
Turn IPC unmount errors into warnings.
Upstream-commit: 944ea3134d6fd68ff33f9bdd2f5b87d458824079
Component: engine
2015-11-02 14:25:39 -08:00
74bc9966e0 Log error from unmountVolumes on cleanup
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a20fea1823ccfb40d235607e8f7ce7ceff1b5afe
Component: engine
2015-11-02 14:11:42 -08:00
51f09a359c IT for ungraceful daemon restart with multiple host-mode containers
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: b323e3df8bcb52607e57d5f49dcb7a93edafa84a
Component: engine
2015-11-02 14:00:11 -08:00
bf1b372cbc 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>
Upstream-commit: 257c59251bd9a03aea4f3188a8160c54f37950ae
Component: engine
2015-11-02 12:40:18 -08:00
51dda01ea0 create generic backend to cut dependency on daemon
- create a network-specific interface that for the methods of daemon
   that are used
 - remove dependency on daemon package

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 5087977fc1a4279be55f25e0b8782c9cf9bc65f3
Component: engine
2015-11-02 12:30:10 -08:00
f62844e779 Merge pull request #17558 from aboch/nw
Fix bug in initializeNetwork()
Upstream-commit: beeec6d103cadb037ccd5f9bc4c6647ae74a6b45
Component: engine
2015-11-02 12:15:41 -08:00
0094681e85 Merge pull request #17598 from zelahi/16756-dockercli-createtest
Added c.Assert statements to docker_api_create_test.go
Upstream-commit: 920ab75bd5969fc4d387c530043115974fae8c79
Component: engine
2015-11-02 11:43:20 -08:00
88f746d118 Merge pull request #17619 from jfrazelle/canonical-update
rebased canonical/json off go 1.5.1
Upstream-commit: b95048758a06097469901590e68f40bafb5d1762
Component: engine
2015-11-02 11:42:26 -08:00
dd117ef001 Merge pull request #17620 from vdemeester/unit-test-TESTDIRS
Bring TESTDIRS back for unit-tests
Upstream-commit: f962c0715f153b806742cefaa6e9c9adf4e25273
Component: engine
2015-11-02 11:41:19 -08:00
761f97e89e Windows: Fix unit tests parsers\os
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a40c82804038fdc8b7051aa0b4ba27974c895e36
Component: engine
2015-11-02 11:28:47 -08:00
e2a063d0d8 Fix bug in initializeNetwork()
- On `docker run --net <network id> ...`
  the bug would cause the container to attempt
  to connect to the network two times
- Also made sure endpoint creation rollback will
  be executed on failures in `func (container *Container) connectToNetwork()`

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 45e71a79840887b7974387bedba0544015ab4e3b
Component: engine
2015-11-02 11:20:15 -08:00
f826a1404e Merge pull request #17594 from mrjana/restart
Fix race with host networking causing `invalid argument` errors
Upstream-commit: 6c31a9a50d032f7276c63e23de452eb2cd07335b
Component: engine
2015-11-02 13:46:43 -05:00
b9cfc706d4 Add TESTDIRS back
Makes it simpler to test only one package.
Was removed by #17491.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4a54ab387f4b11310476414f575fb2502970b65d
Component: engine
2015-11-02 19:44:09 +01:00
9601e97681 rebased canonical/json off go 1.5.1
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0d881349e88b55a3ea4e15eef1c464b2ca64a441
Component: engine
2015-11-02 10:23:02 -08:00
ed19776156 Merge pull request #17542 from estesp/restart-root-dir-cleanup
Fix integration-cli daemon restart with user namespaces enabled
Upstream-commit: 6563b7d2e8a5c1ebef978e2ad8a1f7971b385abc
Component: engine
2015-11-02 09:50:12 -08:00
4fcd43d6fd Merge pull request #17605 from runcom/enhance-err-msg
graph: enhance err message on failed image restore
Upstream-commit: ca1e2d5782b90b98a4659de77d849014fe2abcc1
Component: engine
2015-11-02 08:49:43 -08:00