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

26480 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Tonis Tiigi
50566148ca vendor: update swarmkit to cb6d8131 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-08-10 17:53:59 -07:00
Sebastiaan van Stijn
66b656684e
Add warning about systemd socket activation to changelog 
Docker 1.12 ships with an updated unit file on RPM
based distros. Users that have local modifications
to the unit file, or have a drop-in file installed
may not automatically get the updated unit file,
or get an error when starting docker.

This adds a warning to the changelog, and instructions
on how to resolve the issue.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-11 00:53:49 +02:00
Ramon Brooker
73e08286f9
deal with firewalld/docker startup issues 
added the firewalld.service symbol in the After line docker
will always start after firewalld, thus eliminating the issue
of firewall blocking all mapped traffic.

Signed-off-by: Ramon Brooker <Ramon.Brooker@imaginecommunications.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-11 00:13:33 +02:00
Alexander Morozov
2a540c18b6 Merge pull request #25546 from tonistiigi/update-swarmkit 
vendor: update swarmkit to cb6d8131
 2016-08-10 15:03:08 -07:00
Sebastiaan van Stijn
960b7de456 Merge pull request #25588 from thaJeztah/fix-events-since-description 
Fix events "since" query parameter description
 2016-08-10 23:32:26 +02:00
Sebastiaan van Stijn
ceed39b530
Fix events "since" / "until" query parameter description 
The "since" query parameter can be *useful*
for polling (in combination with "until"), but
doesn't actualy stop the endpoint from streaming
events.

This patch updates the description to better
clarify that "since" does not make the endpoint
non-streaming.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-10 23:17:04 +02:00
Brian Goff
79b7062f0a Merge pull request #25583 from cpuguy83/fix_missing_daemon_sock_test 
Ignore socket rm errors on daemon suite teardown
 2016-08-10 17:04:45 -04:00
Sebastiaan van Stijn
06fa5c12e8
Add node remove "force" parameter to 1.25 API docs 
This parameter was documented for 1.24, but we
forgot to add it to the 1.25 docs as well.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-10 23:01:17 +02:00
Thomas Tanaka
d6cae872c7 Add Oracle Linux distro specific selinux policy 
With the latest OL7.2, selinux policy that is shipped
might not be the latest for it to work or build with
selinux policy for docker-1.12.

To be able to achieve that here is what is done:
1. Added systemd_machined policy which is part of systemd.
2. Temporarily comment out unconfined_typebounds because the
current OL7's selinux doesn't have unconfineduser selinux policy,
to include this will be too much. Will revisit this once we have
updated the selinux policy.

Fixes: #24612

Signed-off-by: Thomas Tanaka <thomas.tanaka@oracle.com>
 2016-08-10 13:33:56 -07:00
Tonis Tiigi
5673c53417 Update executor fixes from swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-08-10 13:27:38 -07:00
Tonis Tiigi
3b555a575d vendor: update swarmkit to cb6d8131 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-08-10 13:27:38 -07:00
Victor Vieux
16d5fbfd9a add description in docker plugin ls 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-08-10 13:06:18 -07:00
Yong Tang
f9ef1c892d Update docs so that log-opts takes map ({}) instead of [] 
This fix updates docs so that log-opts takes map (`{}`) instead
of `[]`, as is defined in the impmenetation (`map[string]string`)

This fix fixes 22311.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-08-10 12:50:10 -07:00
Brian Goff
e34244842c Ignore socket rm errors on daemon suite teardown 
Errors here are not important and not really related to set success/failure.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-08-10 15:18:35 -04:00
Sebastiaan van Stijn
83d11710eb Add API documentation for experimental plugin features 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-10 21:15:40 +02:00
Tibor Vass
19a3289250 Merge pull request #25567 from justincormack/name_to_handle_at 
Gate name_to_handle_at by CAP_SYS_ADMIN not CAP_DAC_READ_SEARCH
 2016-08-10 12:02:23 -07:00
Tibor Vass
92b10b497c Merge pull request #25550 from mrjana/net 
Retry creating dynamic networks if not found
 2016-08-10 11:52:56 -07:00
Tibor Vass
fc40ed24d8 Merge pull request #25334 from crosbymichael/selinux-fedora 
Add selinux policy per distro/version
 2016-08-10 11:40:33 -07:00
Alexander Morozov
64605d709f Merge pull request #23951 from allencloud/defer-os-file-close 
add defer file.Close to avoid potential fd leak
 2016-08-10 11:07:15 -07:00
Tibor Vass
a6aea68c35 Merge pull request #24815 from DieterReuter/install-on-raspbian-jessie 
Add support to install Docker on raspbian/jessie
 2016-08-10 11:06:04 -07:00
Sven Dowideit
ce2ca236db Merge pull request #25569 from friism/fix-typo-in-security-doc 
update intro to say there are four things to consider
 2016-08-10 10:34:43 -07:00
Tibor Vass
93b9b19204 Merge pull request #25553 from vieux/restart_plugin 
fix plugins restart on docker restart
 2016-08-10 10:34:17 -07:00