David Calavera
6943fc8dc1
Remove unnecessary Container.changes function.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 6ea9a880dc434446c072ac23b1cab89ec3652140
Component: engine
2015-11-04 12:27:48 -05:00
David Calavera
b52340d649
Decouple daemon and container to mount and unmount filesystems.
...
Side effects:
- Decouple daemon and container to start containers.
- Decouple daemon and container to copy files.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3a497650464b40191bd2cde348e676acf4efe270
Component: engine
2015-11-04 12:27:47 -05:00
David Calavera
57930f801e
Decouple daemon and container to export containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1c94f5f53a47997f76cafb633092fce9dbdab3ea
Component: engine
2015-11-04 12:27:47 -05:00
David Calavera
d721eb8e53
Decouple daemon and container to pause and unpause containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9f79cfdb2f1f6aeb64c84e7cb877fc38d052d187
Component: engine
2015-11-04 12:27:47 -05:00
David Calavera
41d5167da1
Decouple daemon and container to stop and kill containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 4f2a5ba360d0b00213d31f50a5be074c89124c52
Component: engine
2015-11-04 12:27:47 -05:00
David Calavera
aecf79764a
Move exportContainerRw to the daemon.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 581380cc6cd26f43fe5e69965873769d8dc739ef
Component: engine
2015-11-04 12:27:47 -05:00
Christopher Jones
6365ef1b2a
Fixed link to contribution page in docs/README.md.
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 836fa1c1e5ef98e498df9da02049255a0e9b3d0d
Component: engine
2015-11-04 11:24:03 -06:00
Tianon Gravi
8ed1354382
Merge pull request #17664 from jfrazelle/fedora-23
...
add fedora 23
Upstream-commit: 7e5f90483039eeaa5a4b6d17ec0f688e68f7d768
Component: engine
2015-11-04 08:27:54 -08:00
Vincent Demeester
8f08862095
Merge pull request #17683 from haoshuwei/fix-wordspelling-in-network
...
Fixing wrong word spelling in api/client/network.go
Upstream-commit: fbd18cbce75d3e77db45f3eefaed0237cdb43ed4
Component: engine
2015-11-04 16:02:08 +01:00
Shuwei Hao
33cdda7a99
Fixing wrong word spelling in api/client/network.go
...
Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com >
Upstream-commit: 11062ea17787b66e27978dc8a3d5a69ea318dc61
Component: engine
2015-11-04 13:42:34 +00:00
Antonio Murdaca
ab3f1d521b
Merge pull request #17672 from LK4D4/unn_var
...
Remove unnecessary var decls
Upstream-commit: 0f41761290160fbce38b6db62916d3009967954c
Component: engine
2015-11-04 12:24:52 +01:00
Zhang Kun
bc15824df1
add c.Assert in docker_cli_ps_test.go
...
Signed-off-by: Zhang Kun <zkazure@gmail.com >
Upstream-commit: 83b03b00578a27f24dc80bb110d36b1f6eed7684
Component: engine
2015-11-04 17:29:25 +08:00
Fathi Boudra
aeaa07bfd4
Remove yum cache to reduce image size
...
mkimage-yum.sh has a lot in common with mkimage-rinse.sh, including extra
files clean up. Sync with mkimage-rinse.sh by removing yum cache to reduce
the image size.
Minor changes to reduce also the delta/diff and make it easier to sync with
mkimage-rinse.sh script.
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org >
Upstream-commit: 3e9fc478aebee8d4c3dd96e150e6af450dfe9350
Component: engine
2015-11-04 07:19:09 +02:00
Alexander Morozov
aaf60225d8
Remove unnecessary var decls
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: cec31abfea0576a9899b861a239ddf9dc1d7672a
Component: engine
2015-11-03 17:03:40 -08:00
Brian Goff
014aae9963
Merge pull request #17630 from LK4D4/syscall_umount_warn
...
Do not ignore error from syscall.Unmount
Upstream-commit: c9208953fac6174bb205bd1b3705f81a602869c2
Component: engine
2015-11-03 19:58:19 -05:00
Jess Frazelle
a0ca658098
Merge pull request #17665 from LK4D4/setupwd_refactor
...
Reorder code slightly in setupWorkingDirectory
Upstream-commit: 562a1263f2ce93b649a09803659be40c61b51b35
Component: engine
2015-11-03 15:56:10 -08:00
Jess Frazelle
9aef196743
Merge pull request #17614 from LK4D4/fix_golint
...
Update linting tools to latest versions
Upstream-commit: e704182c9c5bea1655791d11d13878b6a5ec949c
Component: engine
2015-11-03 15:32:12 -08:00
Alexander Morozov
dc1ef8ad94
Reorder code slightly in setupWorkingDirectory
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: bb66c168719f19a84909446dc177a6cf2f19eb23
Component: engine
2015-11-03 14:33:31 -08:00
Sebastiaan van Stijn
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
Jessica Frazelle
57e4556453
add fedora 23 for all the crazies who already want it
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: 45788bb62d6dcdc5b429b5ba10216d2af0402119
Component: engine
2015-11-03 14:01:55 -08:00
David Calavera
8b9ba207b3
Merge pull request #17663 from tiborvass/merge_release_v1.9.0
...
Merge release v1.9.0
Upstream-commit: 65ffd917c644d792b9400efbd62eb380e1d9e6eb
Component: engine
2015-11-03 13:40:37 -08:00
Tibor Vass
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
Tibor Vass
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
Antonio Murdaca
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
Brian Goff
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
Michael Crosby
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
Srini Brahmaroutu
13774a5b6d
after the changes to unit test framework, fixing gccgo to run unit tests
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 81b3d2eec9d107e7bb6e839ca3506f0bf9dee9db
Component: engine
2015-11-03 17:57:06 +00:00
Brian Goff
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
moxiegirl
6c22865832
Merge pull request #17658 from moxiegirl/incorporate-madhu-comments
...
Updating networking docs with technical information
Upstream-commit: 49f55b273b3ff0d0661f0707d6d9b6c9a98eebdd
Component: engine
2015-11-03 08:44:07 -08:00
Madhu Venugopal
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
David Calavera
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
342156922a
Merge pull request #17652 from moxiegirl/nigel-credits
...
Nigel acknowledgement
Upstream-commit: d3b2e7dcf4991bf812cb329119420f03356aaa1a
Component: engine
2015-11-03 15:35:53 +01:00
Sebastiaan van Stijn
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
Mary Anthony
f345c4165c
Nigel acknowledgement
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 7b978cc3781758cfc12259a5259665ba5e822a84
Component: engine
2015-11-03 05:52:33 -08:00
Sebastiaan van Stijn
99351a8c8b
Merge pull request #17651 from moxiegirl/nathans-tweaks
...
Fixing ZooKeeper and some other nits Nathan found
Upstream-commit: 43ad21829304ed2bb9a63b8fc86a83f01a18d5d5
Component: engine
2015-11-03 14:40:11 +01:00
Mary Anthony
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
Sebastiaan van Stijn
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
rsmoorthy
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
Kun Zhang
d2a6a4c389
update docker_cli_help_test.go
...
Signed-off-by: Kun Zhang <zkazure@gmail.com >
Upstream-commit: 8845259f49c8176cb0944e594dff5eda25646e2f
Component: engine
2015-11-03 18:24:47 +08:00
kayrus
c1c1eb239a
Updated vendor go-systemd with enabled TLS activation
...
Signed-off-by: kayrus <kay.diam@gmail.com >
Upstream-commit: 0a6acbede31702f541c6caf801e6f5421bfed989
Component: engine
2015-11-03 11:02:05 +01:00
Gou Rao
8be737c17a
Update plugins.md
...
Add OpenStorage to Docker plugin list.
Signed-off-by: Gou Rao <gou@portworx.com >
Upstream-commit: 0385b9b65d3f68afe861d2dc52e1bcc9f856a007
Component: engine
2015-11-02 22:23:13 -08:00
moxiegirl
d11cadb6bd
Merge pull request #17486 from moxiegirl/16286-storage-drivers
...
Improved Storage Driver Documentation
Upstream-commit: 05a4cb22211063adbe68f63b61a19e39ebda8302
Component: engine
2015-11-02 21:42:03 -08:00
Mary Anthony
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
moxiegirl
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
Mary Anthony
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
Alexander Morozov
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
RyanDeng
31b5bfbd70
fix the bug: cpu percent will extremely high
...
Signed-off-by: Chao Deng <sheldon.d1018@gmail.com >
Upstream-commit: e222c61594e86e3c4728e6ba65ce8762fd640bd8
Component: engine
2015-11-03 10:57:52 +08:00
Tonis Tiigi
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
Jana Radhakrishnan
bafe2d42bf
Fix a corner case issue when daemon panics
...
There is an extreme corner case where when the daemon
panics at the same time as a container is stopping
and cleaning up the sandbox and the sandbox may have been
left with an inconsistent state. This libnetwork vendoring
fixes that case.
Vendoring in libnetwork @ 5305ea570b85d61dd0fd261cd7e1680da1884678
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 79cffa5ce4a71b29eed66e26c1fb7f153be5c045
Component: engine
2015-11-02 18:37:35 -08:00