0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
26505 commits 14 branches 412 tags 338 MiB
Commit graph

26505 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tõnis Tiigi
b08a1c3fe4 Merge pull request #25660 from justincormack/no-fuse-dev 
Do not create /dev/fuse by default
 2016-08-12 10:05:16 -07:00
Michael Crosby
be045ee2da Merge pull request #25628 from cpuguy83/carry_21567_filter_vol_by_label 
Carry 21567 filter vol by label
 2016-08-12 09:43:45 -07:00
Michael Crosby
34cc19f670 Merge pull request #25509 from Microsoft/jjh/23079 
Windows: Block ReFS file systems
 2016-08-12 09:32:22 -07:00
Vincent Demeester
64f83cee43 Merge pull request #25568 from thaJeztah/enhance-string-truncate 
Implement stringutils.Ellipsis()
 2016-08-12 17:19:50 +02:00
Justin Cormack
39ecc08f32 Do not create /dev/fuse by default 
This device is not required by the OCI spec.

The rationale for this was linked to docker/docker#2393

So a non functional /dev/fuse was created, and actual fuse use still is
required to add the device explicitly. However even old versions of the JVM
on Ubuntu 12.04 no longer require the fuse package, and this is all not
needed.

See also https://github.com/opencontainers/runc/pull/983 although this
change alone stops the fuse device being created.

Tested and does not change actual ability to use fuse.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-08-12 12:33:42 +01:00
Sebastiaan van Stijn
d8240c8e27 Merge pull request #25564 from coolljt0725/fix_inspect_network 
Fix inspect network show gateway with mask
 2016-08-12 11:11:09 +02:00
Vincent Demeester
4f20721c9a Merge pull request #25643 from aaronlehmann/vendor-swarmkit-etcd 
Vendor new swarmkit and etcd/raft
 2016-08-12 11:10:58 +02:00
Vincent Demeester
353af0b3ec Merge pull request #25557 from yongtang/25529-image-load-api 
Return `application/json` for image/load API (quiet=1)
 2016-08-12 11:07:43 +02:00
Tibor Vass
57cf20c2ca Merge pull request #25642 from anusha-ragunathan/plugin-shutdown-lock 
Fix deadlock on plugin shutdown.
 2016-08-11 21:07:34 -07:00
Tibor Vass
a9a6d4e214 Merge pull request #25646 from tiborvass/fix-network-flag-on-service-update 
Remove --network-add and --network-rm flags from service update
 2016-08-11 21:06:28 -07:00
Madhu Venugopal
7d6f671b23 Merge pull request #25648 from docker/libn-bump 
Vendoring libnetwork for 1.12.1-rc1
 2016-08-12 08:54:13 +05:30
Tibor Vass
3a7e90c743 Remove --network-add and --network-rm flags from service update 
These flags were not supported (daemon returns an error), and it was an
oversight. They were not present in completion scripts.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 19:37:21 -07:00
Anusha Ragunathan
4d009084de Fix deadlock on plugin shutdown. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-08-11 19:36:32 -07:00
Santhosh Manohar
b9c9fa2855 Vendoring libnetwork for 1.12.1-rc1 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-08-11 18:44:32 -07:00
Aaron Lehmann
be48cfc8eb Vendor new swarmkit and etcd/raft. 
This brings in a much newer version of etcd/raft.

An unrelated change in swarmkit should fix some problems with
integration tests on ARM.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-08-11 18:35:21 -07:00
Lei Jitang
096bb5fb07 Fix inspect network show gateway with mask 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-08-11 21:08:54 -04:00
Justin Cormack
5947bf461f Merge pull request #25630 from dims/mask-timer_list 
Adding /proc/timer_list to the masked paths list
 2016-08-11 23:37:12 +01:00
Sebastiaan van Stijn
92ef3f615a Merge pull request #25505 from darrenstahlmsft/SignalProcessNewAPI 
Changed SignalProcess to use new hcsshim API
 2016-08-11 23:21:31 +02:00
Michael Crosby
3011a41d3f Merge pull request #25561 from allencloud/make-more-pkgs-support-darwin 
make more pkgs support darwin
 2016-08-11 14:17:57 -07:00
Michael Crosby
532aeff9d5 Merge pull request #25614 from mbentley/docs-update-ubuntu-install 
Add install of virtual kernel extras for AUFS
 2016-08-11 13:47:33 -07:00
Sebastiaan van Stijn
5b68177a6e Merge pull request #25548 from thaJeztah/plugin-api-docs 
Add API documentation for experimental plugin features
 2016-08-11 21:52:04 +02:00
Brian Goff
d6bf76136f Merge pull request #25570 from allencloud/remove-fl-prefix-in-ContainerOptions 
remove fl prefix in containerOptions
 2016-08-11 15:43:41 -04:00
Brian Goff
52286b402e Merge pull request #25524 from WeiZhang555/debug-win2lin 
Bugfix: client hangs after run container
 2016-08-11 15:43:00 -04:00
Davanum Srinivas
03bd00b68f Adding /proc/timer_list to the masked paths list 
/proc/timer_list seems to leak information about the host. Here is
an example from a busybox container running on docker+kubernetes.

 # cat /proc/timer_list | grep -i -e kube
 <ffff8800b8cc3db0>, hrtimer_wakeup, S:01, futex_wait_queue_me, kubelet/2497
 <ffff880129ac3db0>, hrtimer_wakeup, S:01, futex_wait_queue_me, kube-proxy/3478
 <ffff8800b1b77db0>, hrtimer_wakeup, S:01, futex_wait_queue_me, kube-proxy/3470
 <ffff8800bb6abdb0>, hrtimer_wakeup, S:01, futex_wait_queue_me, kubelet/2499

Signed-Off-By: Davanum Srinivas <davanum@gmail.com>
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2016-08-11 15:19:26 -04:00
Tibor Vass
faaab62f73 Merge pull request #25593 from thtanaka/oracle-selinux 
Add Oracle Linux distro specific selinux policy
 2016-08-11 11:27:54 -07:00
Tibor Vass
7758ced594 Merge pull request #25591 from tiborvass/fix-release-script 
Make release scripts architecture-agnostic and add ARM support
 2016-08-11 11:27:19 -07:00
Tibor Vass
2ff2e9a730 Make release scripts architecture-agnostic and add ARM support 
This patch allows to only release the packages that were built and are
present under the bundles/ directory instead of assuming packages exist
for all distros enumerated in the contrib/builder/ directory.

It also now adds support for armhf architecture for apt repositories.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2016-08-11 11:18:52 -07:00
Vincent Demeester
49cd1680f0 Merge pull request #25428 from yongtang/25375-idempotent-service-update-publish-add 
Fix issue in `service update --publish-add`
 2016-08-11 20:11:33 +02:00
Brian Goff
6d787dae1a Carry #21567 
Use `LabeledVolume` interface type instead of manual interface.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-08-11 13:47:01 -04:00
Kai Qiang Wu(Kennan)
1a72934cd5 Add label filter support for volume 
Since we added labels for volume, it is desired to have
filter support label for volume

Closes: #21416
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
 2016-08-11 13:08:04 -04:00
Brian Goff
d834eb6910 Merge pull request #25595 from thaJeztah/add-warning-to-changelog 
Add warning about systemd socket activation to changelog
 2016-08-11 12:57:14 -04:00
Zhang Wei
eadcb99619 Refactor waitExitOrRemoved by mlaventure 
Reduce complexity of waitExitOrRemoved.

Signed-off-by: mlaventure
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-08-12 00:50:07 +08:00
Vincent Demeester
e4a88b3a23 Merge pull request #25603 from mavenugo/1.12-rc1-ln-vin 
Vendoring libnetwork for 1.12.1-rc1
 2016-08-11 15:39:28 +02:00
Sebastiaan van Stijn
51dc35cf23
Implement stringutils.Ellipsis() 
This patch implements an Ellipsis utility to
append an ellipsis (...)  when truncating
strings in output.

It also fixes the existing Truncate() utility
to be compatible with unicode/multibyte characters.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-11 14:14:06 +02:00
Vincent Demeester
ed1a313d8f Merge pull request #25556 from vieux/plugin_description 
add description in docker plugin ls
 2016-08-11 14:08:50 +02:00
Vincent Demeester
a3432c2fdb Merge pull request #25604 from allencloud/add-missing-fields-in-volume-api 
add fields in volume api for 1.24, 1.25
 2016-08-11 14:03:25 +02:00
allencloud
b015fd4fb3 add fields in volume api for 1.24, 1.25 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-08-11 19:56:17 +08:00
Matt Bentley
e715ca506f
Add install of virtual kernel extras for AUFS 
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
 2016-08-11 07:54:20 -04:00
Sebastiaan van Stijn
f1101ebf3e Merge pull request #25611 from lixiaobing10051267/masterJoin 
docker swarm join command has no flag '--swarm-token'
 2016-08-11 13:30:07 +02:00
lixiaobing10051267
fcf732117d docker swarm join command has no flag 'X--swarm-token' 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-11 19:49:38 +08:00
Sebastiaan van Stijn
81fca603a4 Merge pull request #25610 from lixiaobing10051267/masterSwarm 
optimize some descriptions for swarm nodes.md
 2016-08-11 13:29:47 +02:00
lixiaobing10051267
fa52bd5cf8 optimize some descriptions for swarm nodes.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-11 19:07:56 +08:00
Sebastiaan van Stijn
a19029a719 Merge pull request #25573 from thaJeztah/improve-runmetrics-layout 
docs: improve layout for runmetrics
 2016-08-11 10:43:15 +02:00
Vincent Demeester
e42cc1f6c5 Merge pull request #25585 from yongtang/22311-log-opts-map 
Update docs so that log-opts takes map (`{}`) instead of `[]`
 2016-08-11 09:55:25 +02:00
Vincent Demeester
e26c35408d Merge pull request #25590 from thaJeztah/add-node-force-remove-api-docs 
Add node remove "force" parameter to 1.25 API docs
 2016-08-11 09:47:41 +02:00
Vincent Demeester
39b379cc63 Merge pull request #25592 from thaJeztah/carry-25344-fix-firewalld-startup-order 
[carry 25344] deal with firewalld/docker startup issues
 2016-08-11 09:46:44 +02:00
Madhu Venugopal
6645ff8ac1 Vendoring libnetwork for 1.12.1-rc1 
* Fixes https://github.com/docker/docker/issues/25236
* Fixes https://github.com/docker/docker/issues/24789
* Fixes https://github.com/docker/docker/issues/25340
* Fixes https://github.com/docker/docker/issues/25130
* Fixes https://github.com/docker/libnetwork/issues/1387
* Fix external DNS responses > 512 bytes getting dropped
* Fix crash when remote plugin returns empty address string
* Make service LB work from self
* Fixed a few race-conditions

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-08-11 00:12:43 -07:00
allencloud
8ed657d09e remove fl prefix in containerOptions 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-08-11 11:20:00 +08:00
Yong Tang
b487497cd2 Idempotent service update --publish-add 
This fix tries to address the issue raised in 25375 where
`service update --publish-add` returns an error if the exact
same value is repeated (idempotent).

This fix use a map to filter out repeated port configs so
that `--publish-add` does not error out.

An integration test has been added.

This fix fixes 25375.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-08-10 18:03:43 -07:00
Tonis Tiigi
82cbb15ff4 Update executor fixes from swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-08-10 17:54:00 -07:00