toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,472 Commits 3 Branches 295 Tags
a351dde060ee54915dafcdb61286c9470a9ed14b
Commit Graph
26472 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Goff a351dde060 Merge pull request #25524 from WeiZhang555/debug-win2lin 
Bugfix: client hangs after run container
Upstream-commit: 52286b402ef4c25ac90b35f23a9717680e0f8ff7
Component: engine
 2016-08-11 15:43:00 -04:00
Tibor Vass 682232d48f Merge pull request #25593 from thtanaka/oracle-selinux 
Add Oracle Linux distro specific selinux policy
Upstream-commit: faaab62f73f75af61e14cba5446fc7cd67934f01
Component: engine
 2016-08-11 11:27:54 -07:00
Tibor Vass 915e5e6f9f Merge pull request #25591 from tiborvass/fix-release-script 
Make release scripts architecture-agnostic and add ARM support
Upstream-commit: 7758ced59427a41d2205bc26cbd4596c71a47072
Component: engine
 2016-08-11 11:27:19 -07:00
Tibor Vass 6221e2aa8d 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>
Upstream-commit: 2ff2e9a73076b737948c68c26f26b7bda5ac7db8
Component: engine
 2016-08-11 11:18:52 -07:00
Vincent Demeester fb8424f405 Merge pull request #25428 from yongtang/25375-idempotent-service-update-publish-add 
Fix issue in `service update --publish-add`
Upstream-commit: 49cd1680f03f1a388549594373a0717c7fab8b44
Component: engine
 2016-08-11 20:11:33 +02:00
Brian Goff 746c53746d Merge pull request #25595 from thaJeztah/add-warning-to-changelog 
Add warning about systemd socket activation to changelog
Upstream-commit: d834eb69102230716a4ff729617e6fe680ddcbb6
Component: engine
 2016-08-11 12:57:14 -04:00
Zhang Wei b381837a1c Refactor waitExitOrRemoved by mlaventure 
Reduce complexity of waitExitOrRemoved.

Signed-off-by: mlaventure
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: eadcb996192e0bded2eaadef842dd86e9013cc27
Component: engine
 2016-08-12 00:50:07 +08:00
Vincent Demeester 63a92c313a Merge pull request #25603 from mavenugo/1.12-rc1-ln-vin 
Vendoring libnetwork for 1.12.1-rc1
Upstream-commit: e4a88b3a23230bdcafe5cb0f410a7d030a66bf17
Component: engine
 2016-08-11 15:39:28 +02:00
Vincent Demeester adf210319c Merge pull request #25556 from vieux/plugin_description 
add description in docker plugin ls
Upstream-commit: ed1a313d8f03ce1cc2eef56e66644fccb4d61eaa
Component: engine
 2016-08-11 14:08:50 +02:00
Vincent Demeester 3344338b88 Merge pull request #25604 from allencloud/add-missing-fields-in-volume-api 
add fields in volume api for 1.24, 1.25
Upstream-commit: a3432c2fdbc2bdab15e49599815f42660904fdd9
Component: engine
 2016-08-11 14:03:25 +02:00
allencloud 0eb3f4278c add fields in volume api for 1.24, 1.25 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: b015fd4fb3a8def4812491bae702275efc6ab0cb
Component: engine
 2016-08-11 19:56:17 +08:00
Sebastiaan van Stijn 78c72ac827 Merge pull request #25611 from lixiaobing10051267/masterJoin 
docker swarm join command has no flag '--swarm-token'
Upstream-commit: f1101ebf3e8fed953528c30bb7d329857fb58805
Component: engine
 2016-08-11 13:30:07 +02:00
lixiaobing10051267 ea7fd73f3c docker swarm join command has no flag 'X--swarm-token' 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: fcf732117df0d4a57202cc056ee9c24749745bd4
Component: engine
 2016-08-11 19:49:38 +08:00
Sebastiaan van Stijn ed03b3e574 Merge pull request #25610 from lixiaobing10051267/masterSwarm 
optimize some descriptions for swarm nodes.md
Upstream-commit: 81fca603a4c828a7bca882cd504cc32b0a7b0d1d
Component: engine
 2016-08-11 13:29:47 +02:00
lixiaobing10051267 a0f2fd5022 optimize some descriptions for swarm nodes.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: fa52bd5cf8f8e40189a0a9ba1bac61bd5ace4a91
Component: engine
 2016-08-11 19:07:56 +08:00
Sebastiaan van Stijn ca39dfa474 Merge pull request #25573 from thaJeztah/improve-runmetrics-layout 
docs: improve layout for runmetrics
Upstream-commit: a19029a719f209f1bf2e760f11225027787550e2
Component: engine
 2016-08-11 10:43:15 +02:00
Vincent Demeester 4074463266 Merge pull request #25585 from yongtang/22311-log-opts-map 
Update docs so that log-opts takes map (`{}`) instead of `[]`
Upstream-commit: e42cc1f6c53a139e08c28dee607105eecafc029e
Component: engine
 2016-08-11 09:55:25 +02:00
Vincent Demeester 1383b4fbda Merge pull request #25590 from thaJeztah/add-node-force-remove-api-docs 
Add node remove "force" parameter to 1.25 API docs
Upstream-commit: e26c35408d178e8f6b7c57e26dc57c6fa611622c
Component: engine
 2016-08-11 09:47:41 +02:00
Vincent Demeester f2b962fc15 Merge pull request #25592 from thaJeztah/carry-25344-fix-firewalld-startup-order 
[carry 25344] deal with firewalld/docker startup issues
Upstream-commit: 39b379cc632e9e2d7a6ace6e9aa7b40099945679
Component: engine
 2016-08-11 09:46:44 +02:00
Madhu Venugopal a67684d015 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>
Upstream-commit: 6645ff8ac1e6ff1c1a67b5d7d33b34dbdebf2924
Component: engine
 2016-08-11 00:12:43 -07:00
Yong Tang 932aa61090 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>
Upstream-commit: b487497cd2d7586fd7e10affdcc514ca6b7884f6
Component: engine
 2016-08-10 18:03:43 -07:00
Tonis Tiigi 6b8a90e881 Update executor fixes from swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 82cbb15ff4e8d6472faa3201149b2478a94e2f0f
Component: engine
 2016-08-10 17:54:00 -07:00
Tonis Tiigi c2c1de1f8a vendor: update swarmkit to cb6d8131 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 50566148cab0610378d6258f069bfb7d72d89cea
Component: engine
 2016-08-10 17:53:59 -07:00
Sebastiaan van Stijn 579cc8506c 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>
Upstream-commit: 66b656684e32884b46c9abb08c874b202f6c77e8
Component: engine
 2016-08-11 00:53:49 +02:00
Ramon Brooker 5b967c9349 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>
Upstream-commit: 73e08286f920881a431fa7befd3909e72303680b
Component: engine
 2016-08-11 00:13:33 +02:00
Alexander Morozov 64cc925c02 Merge pull request #25546 from tonistiigi/update-swarmkit 
vendor: update swarmkit to cb6d8131
Upstream-commit: 2a540c18b69bebd7153ba87ffc91aade95ba2769
Component: engine
 2016-08-10 15:03:08 -07:00
Sebastiaan van Stijn 361e7bc477 Merge pull request #25588 from thaJeztah/fix-events-since-description 
Fix events "since" query parameter description
Upstream-commit: 960b7de456883864479428cdabb5189a348eb700
Component: engine
 2016-08-10 23:32:26 +02:00
Sebastiaan van Stijn 4fe64ab5f6 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>
Upstream-commit: ceed39b530838451b5b9c64b372307a0cc8492ab
Component: engine
 2016-08-10 23:17:04 +02:00
Brian Goff 0b22ed7997 Merge pull request #25583 from cpuguy83/fix_missing_daemon_sock_test 
Ignore socket rm errors on daemon suite teardown
Upstream-commit: 79b7062f0ad4490cdaecd52a786fba586a4f10a8
Component: engine
 2016-08-10 17:04:45 -04:00
Sebastiaan van Stijn fcebb07e97 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>
Upstream-commit: 06fa5c12e8a0a4a6ed5766ff123fff06343c603c
Component: engine
 2016-08-10 23:01:17 +02:00
Thomas Tanaka eb441d6504 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>
Upstream-commit: d6cae872c704c6cf36ee7d5c9b472e33280af202
Component: engine
 2016-08-10 13:33:56 -07:00
Tonis Tiigi 28fcc3f1f9 Update executor fixes from swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 5673c53417d689704ca7b5715f5c4d549fdf710c
Component: engine
 2016-08-10 13:27:38 -07:00
Tonis Tiigi 0130526e07 vendor: update swarmkit to cb6d8131 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 3b555a575dfe9badbcd31fd8bc1f03fde746fe88
Component: engine
 2016-08-10 13:27:38 -07:00
Victor Vieux f7227f216b add description in docker plugin ls 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 16d5fbfd9aa28d6dab250452b30b51b7916b0888
Component: engine
 2016-08-10 13:06:18 -07:00
Yong Tang e6d8343517 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>
Upstream-commit: f9ef1c892d2ed345ac8ab83977bc710a8c13d652
Component: engine
 2016-08-10 12:50:10 -07:00
Brian Goff f2ff00f808 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>
Upstream-commit: e34244842ca968ff96769d1b5eab52fecddee80d
Component: engine
 2016-08-10 15:18:35 -04:00
Tibor Vass fad1c60365 Merge pull request #25567 from justincormack/name_to_handle_at 
Gate name_to_handle_at by CAP_SYS_ADMIN not CAP_DAC_READ_SEARCH
Upstream-commit: 19a3289250e5b22081439659d34f8bd4266ed0a3
Component: engine
 2016-08-10 12:02:23 -07:00
Tibor Vass db498d9dca Merge pull request #25550 from mrjana/net 
Retry creating dynamic networks if not found
Upstream-commit: 92b10b497cf272f8fd307e2e6cc1f27199f132cd
Component: engine
 2016-08-10 11:52:56 -07:00
Tibor Vass 874b6f9cd1 Merge pull request #25334 from crosbymichael/selinux-fedora 
Add selinux policy per distro/version
Upstream-commit: fc40ed24d810ea481dd358990926bc57d40c308d
Component: engine
 2016-08-10 11:40:33 -07:00
Alexander Morozov cb1c855c27 Merge pull request #23951 from allencloud/defer-os-file-close 
add defer file.Close to avoid potential fd leak
Upstream-commit: 64605d709f9bf5677d513d6ed78d63fffadc697d
Component: engine
 2016-08-10 11:07:15 -07:00
Tibor Vass b3651d506c Merge pull request #24815 from DieterReuter/install-on-raspbian-jessie 
Add support to install Docker on raspbian/jessie
Upstream-commit: a6aea68c35a6d0c27d2c299aaeff6aecd9a451e8
Component: engine
 2016-08-10 11:06:04 -07:00
Sven Dowideit ea87241cea Merge pull request #25569 from friism/fix-typo-in-security-doc 
update intro to say there are four things to consider
Upstream-commit: ce2ca236db87f8f580cb29be27b4f0b5341af0ca
Component: engine
 2016-08-10 10:34:43 -07:00
Tibor Vass 8095bfc379 Merge pull request #25553 from vieux/restart_plugin 
fix plugins restart on docker restart
Upstream-commit: 93b9b19204cc82a5b7205726f452020e209903d1
Component: engine
 2016-08-10 10:34:17 -07:00
Sebastiaan van Stijn 8ab414f46c Improve layout for runmetrics 
Change bullet-lists to tables

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 29fb644c189d710823540a06128a1e0ff6c01282
Component: engine
 2016-08-10 18:42:43 +02:00
Michael Friis abb7fbbaec update intro to say there are four things to consider 
Signed-off-by: Michael Friis <friism@gmail.com>
Upstream-commit: 9c37bf9f1fc28ef28dc62ea496e6f56dafcdfd89
Component: engine
 2016-08-10 08:45:24 -07:00
Vincent Demeester 5cad711215 Merge pull request #25563 from lixiaobing10051267/master100 
test container state timeout with 200 milliseconds
Upstream-commit: 414e3f3caba6068d9fcde068eb3240456bc0b3ad
Component: engine
 2016-08-10 15:32:55 +02:00
Vincent Demeester 3fbb0152cb Merge pull request #25406 from pwzgorilla/master 
use `proto` and `addr` replace `protoAddrParts[0]` and `protoAddrPart…
Upstream-commit: 3b1f82b52d53814e5ab60928de052ae2dba63f28
Component: engine
 2016-08-10 14:07:30 +02:00
Vincent Demeester 77bffbde97 Merge pull request #25427 from yongtang/25404-service-update-env-add 
Fix `service update --env-add` issue
Upstream-commit: 59ca493121680212ab119cbf264fcdb75b699adf
Component: engine
 2016-08-10 14:07:05 +02:00
Justin Cormack d430eb5c8c Gate name_to_handle_at by CAP_SYS_ADMIN not CAP_DAC_READ_SEARCH 
Only open_by_handle_at requires CAP_DAC_READ_SEARCH.

This allows systemd to run with only `--cap-add SYS_ADMIN`
rather than having to also add `--cap-add DAC_READ_SEARCH`
as well which it does not really need.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: c1ca124682a90f3306b34ad104ba80e413f7bf88
Component: engine
 2016-08-10 12:22:36 +01:00
lixiaobing10051267 7c36224e9c test container state timeout with 200 milliseconds 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 51f927d4e5007d11d71a9cd68a6b1e93828becc5
Component: engine
 2016-08-10 17:19:25 +08:00