Commit Graph

1303 Commits

Author SHA1 Message Date
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
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
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
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
4351cce524 Update logic of history
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 5a3236d9e8ee8c0051c0cc758ec359fa089b3291
Component: engine
2015-11-02 10:27:54 +08:00
1dd04a954b Merge pull request #16579 from coolljt0725/fix_attach_paused_container
Add show error when attach to a paused container
Upstream-commit: 5719d010665377c0696e36b894e742399deb30ed
Component: engine
2015-10-31 07:43:22 -07:00
4811fae37b Merge pull request #17529 from Microsoft/10662-builderisolation
Windows: [TP4] Allows --isolation on docker build
Upstream-commit: 09cb1f112134670561d33533ecee85aceedfb31c
Component: engine
2015-10-30 17:10:04 -07:00
85edd54e9f Merge pull request #17538 from calavera/deprecated_bridge_interface
Fix network inspect for default networks.
Upstream-commit: 33f54297865984bba0a37cefb110af70cc0135b4
Component: engine
2015-10-30 16:03:51 -07:00
057d34fa0f Fix network inspect for default networks.
- Keep old fields in NetworkSetting to respect the deprecation policy.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f301c5765a0d7f4b6866cedfdface6f87874ff53
Component: engine
2015-10-30 16:55:21 -04:00
d8b5557338 Modify Network structure json tags
- So that they comply with docker inspect convention
  Which is allowing camel case for json field names

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: b2d0b75018c5be5c671a15950546a79cda307cf2
Component: engine
2015-10-30 11:23:59 -07:00
884d36120f Windows: Allows --isolation on docker build
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d5c85897f43b1956f874c6c93d10c30b5b82a726
Component: engine
2015-10-30 11:14:38 -07:00
7426ed02e4 Merge pull request #17365 from HuKeping/rework-history
Rework docker cli history
Upstream-commit: 855487b37926f64ad456c430fb4eb51606d5b256
Component: engine
2015-10-30 10:33:16 +01:00
4244ff4dbb Merge pull request #17463 from dongluochen/volumeRouter
extract docker volume API from local
Upstream-commit: 4f3dd3db5abc5a6044ce6eb1a762bb9e7d327b1f
Component: engine
2015-10-30 08:33:43 +01:00
961ca9c736 Let the api to choose the default network driver.
That way swarm can understand the user's intention.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 34668ad68bb42d7488649e41b32818f3f1a7cff2
Component: engine
2015-10-29 19:47:12 -04:00
45e2cb6b92 Rework docker cli history
The implementation of `history` is a little redundant espacially
when user set the `--human` and/or `--no-trunc` options.

There are too many conditionals for `human`, `no-trunc` and `quiet` which
I think is useless and complicated.

Since `quiet` will only display the container IDs so it could be not
nested with the other options.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 09eedc35b2e309c4b9489e21a623ad72179a8ded
Component: engine
2015-10-29 17:59:07 +08:00
8ca5c39620 Add show error when attach to a paused container
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: de1d611990a80cf4a38ec501469c08c1aeee2d60
Component: engine
2015-10-28 21:00:09 -04:00
238006044d Merge pull request #17423 from cpuguy83/so_sensitive
Revert "dockerversion placeholder for library-import"
Upstream-commit: b227d19cae34d6d0ce92b72a53f02330b0be5992
Component: engine
2015-10-27 18:32:18 -07:00
cc55863497 Revert "dockerversion placeholder for library-import"
This reverts commit d5cd032a86617249eadd7142227c5355ba9164b4.

Commit caused issues on systems with case-insensitive filesystems.
Revert for now

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b78ca243d9fc25d81c1b50008ee69f3e71e940f6
Component: engine
2015-10-27 21:23:53 -04:00
76053edbd7 extract docker volume API from local
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: 9862a4b43ec6236305f6b57274c6edd61dad96b7
Component: engine
2015-10-27 17:28:19 -07:00
fbb5f4e19f Merge pull request #17393 from tiborvass/carry-17360
Carry Fix docker inspect container only reports last assigned information
Upstream-commit: 9ab71b68af5b340373411e26e679c6e7506ce167
Component: engine
2015-10-27 17:00:41 -07:00
1cfc0cf7f6 Merge pull request #17373 from Microsoft/10662-volumetests
Windows: Volume integration tests
Upstream-commit: 2266462f724492d3802d7043723347adeb18024e
Component: engine
2015-10-27 19:52:11 -04:00
6c30abdc61 Extract network settings types for inspect.
Keeping backwards compatibility.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 25682577c9d29b325b4b615c4b88c132a4640082
Component: engine
2015-10-27 19:16:21 -04:00
9cd08e6796 Merge pull request #17350 from vdemeester/11699-auto-libraryimport
dockerversion placeholder for library-import
Upstream-commit: 6276c676a897ab8a4c7fdcd78d18c8fc3a761707
Component: engine
2015-10-27 13:39:40 -07:00
95c227e717 Merge pull request #17364 from mavenugo/advertise
Enhancing --cluster-advertise to support <interface-name>
Upstream-commit: 85ae8b034a5bf9428dbcc7cfd94c55739eaf2862
Component: engine
2015-10-27 13:29:18 -07:00
4d261096ec dockerversion placeholder for library-import
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d5cd032a86617249eadd7142227c5355ba9164b4
Component: engine
2015-10-27 20:36:07 +01:00
8ad5b6fcfd Enhancing --cluster-advertise to support <interface-name>
--cluster-advertise daemon option is enahanced to support <interface-name>
in addition to <ip-address> in order to amke it  automation friendly using
docker-machine.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 3e7db73b99498d037b43eb59972a6360cfbc971b
Component: engine
2015-10-27 11:03:22 -07:00
14116a686a Windows: Volume integration tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2af5034ce8faa1f93d81864aa25ec64527fac76b
Component: engine
2015-10-26 14:33:28 -07:00
e1896c63ba Merge pull request #17266 from cpuguy83/dump_http_request_on_debug
Dump request when daemon is set to debug
Upstream-commit: e252fe288cda563e10f70f55f934f1e05ee06729
Component: engine
2015-10-26 13:41:14 -07:00
d358a1b7cc Merge pull request #17313 from calavera/version_exec_json_check
Version exec json check.
Upstream-commit: 5cf028d3ddc8808bbd3ff710cdd82bf4a04042a2
Component: engine
2015-10-26 13:32:32 -07:00
7e73e071bd Version exec json check.
Keep backwards compatibility with old versions of the api.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0b5e628e14a673cd1940876b2f3d091c2fe236d9
Component: engine
2015-10-26 15:12:06 -04:00
07425589a1 Merge pull request #17351 from mavenugo/predefined
Prevent user from deleting pre-defined networks
Upstream-commit: 34439f3ecb5cbde2f733e162179dfbe57dbaabff
Component: engine
2015-10-26 10:06:45 -07:00
e52c395265 Prevent user from deleting pre-defined networks
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: ead62b59522bba132b9a14712e4350439e7fa2a5
Component: engine
2015-10-25 17:17:29 -07:00
be6855048d Merge pull request #17319 from vdemeester/fix-network-help-inspect-syntax
Update docker network inspect help syntax
Upstream-commit: c10ef20ed86befcf15b32d5081165bbd28b01c94
Component: engine
2015-10-24 21:56:38 -07:00
27d55a1112 Merge pull request #16433 from Microsoft/10662-volumes5
Windows: [TP4] Add volume support
Upstream-commit: e74cf8acad799aff39bf1b8ceffdef471aa0d242
Component: engine
2015-10-23 18:43:07 -04:00
1489d6cd3f Merge pull request #15780 from mountkin/build-multi-tags
Add ability to add multiple tags with docker build
Upstream-commit: 448398c2a8a41b6589dd7deb59fdc889e78db223
Component: engine
2015-10-23 13:50:35 -07:00
9f54d8d961 Update docker network inspect help syntax
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3dd50eaf054833280aad16e718bca4139d927532
Component: engine
2015-10-23 22:48:22 +02:00
a4eeeb73b3 Add ability to add multiple tags with docker build
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: c2eb37f9aeb6215293483e02613514e49011cf2c
Component: engine
2015-10-24 00:59:56 +08:00
d7444aebe0 Dump request when daemon is set to debug
Uses a new middleware which calls httputils.DumpRequest which is output
to `logrus.Debug`.
This is implemented in a separate middleare so that we only have to
check the logging level when the router is instantiated rather than at
every request.
If this was just `logrus.Debug(httputil.DumpRequest(...))`, the
DumpRequest would be called on each request requardless of logging
level set on the daemon.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 37dbe075196d638d6bd417716deaf067247ee966
Component: engine
2015-10-23 09:04:32 -04:00
dad1c1a473 Fail when there is an error executing an inspect template.
- Do not execute the template directly in the cli outout, go is not atomic
in this operation and can send bytes before failing the execution.
- Fail after evaluating a raw interface if the typed execution also
failed, assuming there is a template parsing error.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3b9c13873afdfe6c884e1265397d7c5cb9cd5c5c
Component: engine
2015-10-22 19:24:50 -04:00
b4d3175bf2 Merge pull request #17275 from vdemeester/17246-tags-to-repotags
Use RepoTags & RepoDigest in inspect
Upstream-commit: 4c253ddf204f0c8ebc58c1aa5796c689d623e16b
Component: engine
2015-10-22 17:14:49 -04:00
e1f1cd631a Use RepoTags & RepoDigest in inspect
To be coherent with /images/json (images command)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: f664f6e4b19d4e155d78af2eacddcd941dae4fce
Component: engine
2015-10-22 23:00:59 +02:00
da35e80d77 Show trust variable deprecation warning only if used
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: dfdee4130816cd5334330cc431d8200c1fa4e609
Component: engine
2015-10-22 11:01:30 -07:00
f7f7ce4926 Windows: Add volume support
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a7e686a779523100a092acb2683b849126953931
Component: engine
2015-10-22 10:42:53 -07:00
4a8a97b06e Merge pull request #17218 from vdemeester/17023-network-multiple-inspect
Add support for multiple network in inspect
Upstream-commit: 9f031f70ce832a5f3fde7bd902e66abeb44f19a9
Component: engine
2015-10-21 11:09:02 -07:00
91b1ec8aba Merge pull request #16940 from coolljt0725/default_tls_host
Make default tls host work
Upstream-commit: 6a7c38a57d865afc89e4d6ec388bae3b9bedb870
Component: engine
2015-10-21 14:02:22 -04:00
6672204b41 Merge pull request #17136 from gesellix/change-route-volume-create
rename `POST /volumes` to `POST /volumes/create`
Upstream-commit: 492945235b6be7f2f7ff8721de0c01a93d0b0f6f
Component: engine
2015-10-21 10:21:27 -07:00
9086b77304 Add support for multiple network in inspect
To be consistent with other inspect command (on container and images),
add the possiblity to pass multiple network to the network inspect
commands.

`docker network inspect host bridge none` is possible now.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7af9f988ac535e4ae2e87976db25d4f7047274db
Component: engine
2015-10-21 08:57:29 +02:00
834dc8ee1e Merge pull request #17177 from runcom/bc-fixes
Return empty Config fields, now omitempty, for API < 1.21
Upstream-commit: c516aa645ee407c4b67033b20fcf5c2849b98f21
Component: engine
2015-10-20 16:39:53 -04:00
b4f9b290d4 Merge pull request #17128 from calavera/network_controller_enabled
Do not initialize the networking routes when netController is not enabled.
Upstream-commit: 82a8a14c4d039579f80b640b5f815964e99db746
Component: engine
2015-10-19 16:13:31 -04:00
33442d477a Merge pull request #16957 from MHBauer/eventsservice-refactor
refactor access to daemon member EventsService
Upstream-commit: b27fa6c58e020b35d725b89badb82dbbc5cb84bc
Component: engine
2015-10-19 11:45:29 -07:00