3a3dfe3c77
Merge pull request #31582 from dnephin/misc-flag-cleanup
...
Cleanup some memory flags used in the CLI
Upstream-commit: 83e29a5d87e3c1a0d4a9ae0d6dfe14a9ceb9bb20
Component: engine
2017-03-10 14:16:42 +01:00
9365b0d405
Merge pull request #30870 from ripcurld0/fix_msg_rm
...
Fix the rm error message when a container is restarting/paused
Upstream-commit: 6c31abde2057854bc83c03de971c38ca18264ab4
Component: engine
2017-03-10 10:04:49 +01:00
d7a987c42e
Merge pull request #31718 from aaronlehmann/broken-resp
...
cluster: Fix shadowed resp variable
Upstream-commit: 18163a42ecf5766606f30722db56d54f49533192
Component: engine
2017-03-10 08:36:12 +01:00
e92d0c63e0
cluster: Fix shadowed resp variable
...
The response would never reach the client because it was being
redeclared in the current scope.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 9d127f8de3fa489b2c0d896dd9612f43e45f7cdd
Component: engine
2017-03-09 17:58:12 -08:00
6211769392
Merge pull request #31701 from jlaswell/master
...
Fix typo in run.md documentation
Upstream-commit: 239645c08d63c747eee523ba3459402172120bd8
Component: engine
2017-03-10 10:15:49 +09:00
76f2257338
Merge pull request #31704 from mlaventure/handle-paused-container-on-non-live-restore
...
Handle paused container when restoring without live-restore set
Upstream-commit: abb0fec9d082e56ef7b23789024e6f7061cc6905
Component: engine
2017-03-09 15:59:02 -08:00
9298102f46
Fix the rm error message when a container is restarting/paused
...
Running the rm command on a paused/restarting container
will give an error message saying the container is running
which is incorrect.
To fix that, the error message will have the correct
container state and a procedure to remove it accordingly.
Notice: docker-py was bumped to:
4a08d04aef0595322e1b5ac7c52f28a931da85a5
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 0ec8f56a3d7f1413cdb3ae7711d518e99f9282e9
Component: engine
2017-03-10 00:39:16 +02:00
b027885182
Handle paused container when restoring without live-restore set
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: c458d3bb98bb85359ffaf3b9e54d837ee001829a
Component: engine
2017-03-09 13:37:08 -08:00
28ce235441
Merge pull request #31667 from mlaventure/update-runc
...
Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe
Upstream-commit: 9bf36cb4431b9f06f290658668415d9150618739
Component: engine
2017-03-09 15:50:12 -05:00
6aba7fbe3b
Fix typo in run.md documentation
...
Signed-off-by: John Laswell <john.n.laswell@gmail.com >
Upstream-commit: 4a20252137902100a8a01dd86c698e49dc00e8b2
Component: engine
2017-03-09 13:08:48 -05:00
f54d163984
Merge pull request #31396 from kevinfeyrer/patch-2
...
Update vlan-networks.md
Upstream-commit: 705e031b984e7d976fa5a9fef61e4a76451d6e36
Component: engine
2017-03-09 15:02:58 +01:00
5e81579bc9
Merge pull request #31681 from lixiaobing10051267/masterLayer
...
modify ID to ChainID to avoid confusing
Upstream-commit: 89b4c1d353b1ece4928c00f7eaa661d663c6cb78
Component: engine
2017-03-09 08:45:35 -05:00
e5933a504d
Merge pull request #31684 from albers/fix-stop-signal-help-message
...
Fix description of `docker run|create --stop-signal` in help message
Upstream-commit: 6cf8ff5d1d47cea6a945333c602d45962905d965
Component: engine
2017-03-09 11:36:26 +01:00
42e1c80fbb
modify ID to ChainID to avoid confusing
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 1b0f2d71a1aa9e529357e2ffe342af2a12d7c145
Component: engine
2017-03-09 16:59:04 +08:00
0d16f73693
Fix description of docker run|create --stop-signal in help message
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: b303e229ca6ec61e43b1b7a93f6ff034a3945644
Component: engine
2017-03-09 09:32:16 +01:00
5ef9a2c7ea
Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 49131f3ad47bb6195d9ced8aa5f93faf011f9e58
Component: engine
2017-03-08 14:56:29 -08:00
574f55f777
Update vlan-networks.md
...
Some small changes to get the examples so that they run without error for me.
Improve consistency of presentation of the examples.
Fix some typos
Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com >
Update vlan-networks.md
Restore "ip" accidentally removed
Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com >
Update vlan-networks.md
Change prompt from container "$$" to host "$"
Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com >
Update vlan-networks.md
Some changes suggested by cpuguy83 and thaJeztah
Signed-off-by: kevinfeyrer <kevin.feyrer@btinternet.com >
Upstream-commit: 6ea36d7d48a41225c8573ef649320c1a414b8995
Component: engine
2017-03-08 21:53:24 +00:00
e454be5cbf
Merge pull request #31535 from aaronlehmann/vendor-swarmkit-7fc7503
...
Vendor swarmkit d60ccf3
Upstream-commit: 3fe2730ab3d7bba483d7bf4fb1e95b627823ff4d
Component: engine
2017-03-08 09:52:28 -08:00
8ee62e238a
Merge pull request #31654 from dnephin/add-missing-validate
...
Add compose-bindata validation to default
Upstream-commit: 71f249967e7a82574d89d23172f7c38a5e3be31f
Component: engine
2017-03-08 10:57:05 -05:00
55df7adcd9
Add compose-bindata validation to default.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 18e0a327ca59a6d4d9cb22f309f94b032a7e3b31
Component: engine
2017-03-08 10:23:40 -05:00
a09edbbf93
Merge pull request #31177 from allencloud/donot-allow-subsecond-in-dockerfile-healthcheck
...
do not allow sub second in healthcheck options in Dockerfile
Upstream-commit: fb1890fb9530b3f69b0d9f937fd0b6d8b1972311
Component: engine
2017-03-08 15:18:09 +01:00
6d40d2a062
Merge pull request #31443 from james-nesbitt/export-more-compose-methods
...
exported add. cli compose loader parsing methods
Upstream-commit: fb024df8f0d18fdeff4b73979d51b44f268aeb6b
Component: engine
2017-03-08 15:12:42 +01:00
25aab279f4
Merge pull request #31641 from amatsus/master
...
Fix typo in CHANGELOG.md
Upstream-commit: 58e787602d85ee674164fb9dae1250d2c3e98da1
Component: engine
2017-03-08 15:10:45 +01:00
ac2e133cd8
Merge pull request #31611 from tophj-ibm/skip-plugin-test
...
skip plugin test on non x86 architectures
Upstream-commit: ab8a22de3607f2b5f7afb7a8a93d298f17d124a7
Component: engine
2017-03-08 14:00:15 +00:00
977a744f4a
Fix typo in CHANGELOG.md
...
Signed-off-by: Akihiro Matsushima <amatsusbit@gmail.com >
Upstream-commit: d9325e102cd449645a208fa83cfd2b8cb29ab0d2
Component: engine
2017-03-08 21:13:05 +09:00
8c76bad868
Merge pull request #30856 from allencloud/make-secret-update-support-name-and-id-prefix
...
make secret update support name and id prefix
Upstream-commit: d4a8c3b438cb8ae95916fee3e7fac93639b720f6
Component: engine
2017-03-08 12:31:44 +01:00
0aea84a00e
Merge pull request #31566 from AkihiroSuda/use-latest-vndr
...
rerun vndr
Upstream-commit: 7e031413f20946c9926767c1f16fb3d4cda56e6b
Component: engine
2017-03-08 12:16:50 +01:00
c753d5b3d7
Merge pull request #31623 from aaronlehmann/dropped-taskspec-field
...
Fix dropped field in task translation from GRPC to REST
Upstream-commit: c430aea83c822a506640b10d5e5290b7c86ee46a
Component: engine
2017-03-08 05:24:48 -05:00
bca52758a3
Merge pull request #31620 from justincormack/seccomp-up
...
Seccomp Update
Upstream-commit: 193730bec11ed4fb0f84ae30c49e810e188f0ba1
Component: engine
2017-03-08 12:38:17 +09:00
9b41265701
Vendor swarmkit d60ccf3
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 39433318fe224e9066a892fc5834b38649ec86ac
Component: engine
2017-03-07 19:09:21 -08:00
3442ecd596
rerun vndr
...
* run latest vndr so as to collect more LICENSE files
* remove unused packages
* vendor github.com/philhofer/fwd with LICENSE.md (MIT)
* vendor github.com/bsphere/le_go with LICENSE (MIT)
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 5a1b06d7fd6a0c8722a4f7aee1edf46d8e2a115b
Component: engine
2017-03-08 02:29:34 +00:00
f7cd555009
Fix dropped field in task translation from GRPC to REST
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 497c4f05b931a7f64785543922b19e94362607e6
Component: engine
2017-03-07 14:55:15 -08:00
ac28c83574
Seccomp Update
...
- Update libseccomp-golang to 0.9.0 release
- Update libseccomp to 2.3.2 release
- add preadv2 and pwritev2 syscalls to whitelist
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 9067ef0e32c6a85384dad2a30ac3a49e2f9fe393
Component: engine
2017-03-07 22:19:46 +00:00
569aaf9edd
Merge pull request #31265 from cyli/remove_swarm_subdirs
...
Rather than remove the swarm directory and re-create, remove the subdirs
Upstream-commit: fd5f9d7941287cbbaeecfd16e0159508b3f6af63
Component: engine
2017-03-07 14:30:34 -05:00
e901de0def
Merge pull request #31258 from dnephin/fix-override-default-stack-network
...
Support customizing the default network for a stack
Upstream-commit: dd221a1e1727b8db2f7094605f91c15384ac5df6
Component: engine
2017-03-07 14:28:16 -05:00
26dbe98c09
exported cli compose loader parsing methods
...
Signed-off-by: James Nesbitt <james.nesbitt@wunderkraut.com >
Upstream-commit: a1560a0cf2401ccf37d6b6859b57a9eecd339089
Component: engine
2017-03-07 17:36:35 +02:00
ba46ce307c
Use opts.MemBytes for flags.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: afcaeedbd4249009811ba1c11767173c23ae0814
Component: engine
2017-03-07 10:32:49 -05:00
86791f66a6
Merge pull request #30568 from khudgins/nimbleplugin
...
added listing for Nimble Storage's volume plugin
Upstream-commit: ba5c0f88d56b70f3dfa3d0652e30613ab332b92b
Component: engine
2017-03-07 09:31:53 -05:00
87a178b335
skip plugin test on non x86 architectures
...
Because the plugins in dockerhub aren't multi-arch, they will
fail on non x86-64 platforms. Comment this test out like we do with
the others.
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: e3c6cbed22cfc4c88782a60b00b6febeadc6d947
Component: engine
2017-03-07 09:28:10 -05:00
e14af410b8
Merge pull request #31198 from docbobo/master-manpages-aarch64
...
Improved aarch64 build
Upstream-commit: 7bf408526442a9561f742992d26d730aea891958
Component: engine
2017-03-07 13:53:48 +01:00
4340eba05a
make secret update support name and id prefix
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 9d30525a04e2d4efe51ac9e6c114ce36276aafa8
Component: engine
2017-03-07 16:01:21 +08:00
0b1f6d26c9
Merge pull request #31340 from anusha-ragunathan/plugin_nw_filter
...
Add network plugin filter test
Upstream-commit: 65068ea4c0fdaf300d0c7a06b3478c6c1c6d4271
Component: engine
2017-03-06 15:31:59 -08:00
aa4b36806a
Some things just need to be line wrapped.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2e9f9d2c347186a29fc558e1c95d5246fad66c2a
Component: engine
2017-03-06 16:01:57 -05:00
00f7fe38c2
Merge pull request #30807 from chchliang/networkproject
...
Check parameter --ip --ip6 --link-local-ip in `docker network connect`
Upstream-commit: de5ca681b5aa170d8e486b7a2a3a144fc032ed70
Component: engine
2017-03-06 21:11:55 +01:00
3dd6267361
Add network plugin filter test
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 5e0e957061795535d893dd0f320e82940b6b01a1
Component: engine
2017-03-06 12:05:20 -08:00
f799b6971e
Merge pull request #31577 from thaJeztah/update-changelog-17.03.0-ce
...
Update changelog 17.03.0 ce
Upstream-commit: a2bf823a94f77bb041a5ef336c689adb09a593b6
Component: engine
2017-03-06 11:19:26 -08:00
f18f03bc0c
Merge pull request #31580 from thaJeztah/move-jana-to-alumni
...
Move Jana to alumni
Upstream-commit: 31930bdfe1a179b6bf79c2887ce97eb4af0d9346
Component: engine
2017-03-06 20:17:19 +01:00
52b69d7432
Merge pull request #31578 from vdemeester/request-daemon-host
...
[test-integration] Update request.* signature to remove the host
Upstream-commit: 4e051181f708972e903d82d99f6076b4dd38da37
Component: engine
2017-03-06 19:45:01 +01:00
73a09fcbca
Merge pull request #31194 from albers/completion-volume-aliases
...
Add support for command aliases to bash completion of `docker volume`
Upstream-commit: c6e102c830716b016ea56056555631112e5348d2
Component: engine
2017-03-06 09:52:41 -08:00
5b5acf04b4
Move Jana to alumni
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 1aeb2cf7cbdcc37af187696fc4c6b087048ccc8a
Component: engine
2017-03-06 18:22:00 +01:00
