toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,070 Commits 3 Branches 295 Tags
69096baccba8c3902248736934f61830d112f3ec
Commit Graph
25070 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibor Vass 69096baccb Merge pull request #23532 from swernli/exitCodeFix 
Fixing exit code return on error case in Windows.
Upstream-commit: a590a6b1800778c86f6649b64283d29d14d83024
Component: engine
 2016-06-16 19:01:18 -07:00
Tibor Vass 92262b0c41 Merge pull request #23580 from cpuguy83/plugin_restore 
Fix removing plugins and Implement plugin restore after daemon restart
Upstream-commit: f522ed9752f0075bc856c06639d4a408a23d6e35
Component: engine
 2016-06-16 18:54:57 -07:00
Arnaud Porterie 79ea0079e7 Merge pull request #23644 from tonistiigi/fix-leave-delete 
Fix removing containers on leaving from pending state
Upstream-commit: f4de3f314e1e965056447d5ea6203ca4b66bb6e0
Component: engine
 2016-06-17 01:40:45 +00:00
Arnaud Porterie c1713ee511 Merge pull request #23637 from vieux/add_more_fields_inspect 
add some more fields in docker service inspect -p
Upstream-commit: edfd546a6f8d1d9c80e9ff3abba88a78d4ac3550
Component: engine
 2016-06-17 01:40:26 +00:00
Arnaud Porterie 048ffaf8b1 Merge pull request #23643 from tonistiigi/membership 
Return membership status on join without timeout
Upstream-commit: 0ef720ededc24018ce1f727814b1a9ae93897891
Component: engine
 2016-06-17 01:40:06 +00:00
Arnaud Porterie 433425402a Merge pull request #23549 from dmcgowan/reference-ui-updates 
Do not show empty tags for digest references in output
Upstream-commit: 16a6987a001446c4ff7df3c6c66362dd76685b86
Component: engine
 2016-06-17 00:47:49 +00:00
Arnaud Porterie 0cc35ac1ec Merge pull request #23648 from thaJeztah/fix-overlay-overlay2 
fix "overlay" -> "overlay2" in error message
Upstream-commit: 6d9d149f9980cfda8ed3eeed7446c068de7ae8b6
Component: engine
 2016-06-17 00:21:53 +00:00
Arnaud Porterie cfbfd0a0b9 Merge pull request #23570 from vdemeester/change-plugin-install 
Update docker plugin install code…
Upstream-commit: 7ef9aec90f4f129945ab2f1e2c79b961a7af2209
Component: engine
 2016-06-17 00:12:56 +00:00
Sebastiaan van Stijn 8cac554b16 Merge pull request #23646 from thaJeztah/update-docker-info 
Update docker info output example
Upstream-commit: 314d9dc03a1623b40a3dc49a666f720508ea67d4
Component: engine
 2016-06-16 16:45:44 -07:00
Sebastiaan van Stijn d903446499 fix "overlay" -> "overlay2" in error message 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2d4b285a75621604f31058a43cb5ef1d4618533e
Component: engine
 2016-06-16 16:42:40 -07:00
Sebastiaan van Stijn d74065d7d9 Update docker info output example 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 07e1c62bf4a24e8a075e87b38be3bbe7c8282e42
Component: engine
 2016-06-16 16:29:23 -07:00
Victor Vieux 9dba03a4c5 add some more fields in docker service inspect -p 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 4c9e21b674046e8a3819cfbbb96f471bd280fba5
Component: engine
 2016-06-16 16:22:11 -07:00
Michael Crosby 2eb1181d59 Merge pull request #23639 from mavenugo/ln-rc2 
Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
Upstream-commit: eb6cc318023bea909fc72187b47a3cd6ff250e8e
Component: engine
 2016-06-16 16:17:07 -07:00
Tonis Tiigi dae11af952 Fix removing containers on leaving from pending state 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 826f6f07031abc4dea6f71ed69d33a4e0789ee11
Component: engine
 2016-06-16 16:08:15 -07:00
Vincent Demeester 97ce44d0ef Update ServiceInspectWithRaw 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4a70cb55710a76ee7dfa059c440c34fd6cb84f16
Component: engine
 2016-06-17 00:47:22 +02:00
Michael Crosby 97c2dadb96 Merge pull request #23641 from justincormack/s390seccomp 
Add the seccomp build tag for s390x now runc updated
Upstream-commit: 2fa38a91441a1b8e610925f41eaba70aa8ca8e58
Component: engine
 2016-06-16 15:46:14 -07:00
Vincent Demeester eaf07b6f62 Update docker plugin install code… 
… for more consistency (api side).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2c82337b0490dc0a5b8329d1f23c6bad00d8551b
Component: engine
 2016-06-17 00:33:21 +02:00
Vincent Demeester 8e11dc51d7 Bump engine-api to c57d0447ea1ae71f6dad83c8d8a1215a89869a0c 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 58529a15535ee2accafdde740214c0d5b595d6e1
Component: engine
 2016-06-17 00:32:58 +02:00
Tonis Tiigi 10f6f936be Return membership status on join without timeout 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 1973cee0cd86da3c7b7002a3fed7af2557df538c
Component: engine
 2016-06-16 15:27:08 -07:00
Michael Crosby f06a10b7f6 Merge pull request #23624 from coolljt0725/fix_restore_sandbox 
check running again before restore active sandbox
Upstream-commit: 74c4834d32516761c56e3caceada1aa6bb6f8b86
Component: engine
 2016-06-16 15:24:58 -07:00
Justin Cormack 4914ef91f7 Add the seccomp build tag for s390x now runc updated 
This was waiting for runc bump see https://github.com/docker/docker/issues/23171
runc was bumped in https://github.com/docker/docker/pull/23603

Fixes #23171

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: f8d970169a7ae6dcf46beb69c0367d35d019294e
Component: engine
 2016-06-16 23:21:08 +01:00
Tibor Vass dc3dc99c53 Merge pull request #23520 from yongtang/23500-docker-info-security 
Add security info to `docker info`
Upstream-commit: 6b4e2ad90be9dd642219982d7591f73bd5abaae9
Component: engine
 2016-06-16 15:15:33 -07:00
Tibor Vass bc035d4fca Merge pull request #23640 from stevvooe/update-not-upate 
api/client/service: fix minor spelling error in service inspect
Upstream-commit: 6dc58a1d58a476ed5dee42781aa3313a9472f566
Component: engine
 2016-06-16 15:12:47 -07:00
Tibor Vass 8d1c8c8149 Merge pull request #23515 from HackToday/fixoverlay2 
Add ecryptfs check for overlay2
Upstream-commit: 06da8ce28582417cd93d3242f1d895e46d4a204e
Component: engine
 2016-06-16 15:12:09 -07:00
Tonis Tiigi e79dde3c67 Update daemon to new swarmkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: a83bba467a8bd24924b1a0cf55b954ac49937b5b
Component: engine
 2016-06-16 15:06:27 -07:00
Tonis Tiigi e47c5a4788 Update swarmkit to 310f1119 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 2783568284a0c84bbb53df3c40295d27a151889e
Component: engine
 2016-06-16 15:06:27 -07:00
Sebastiaan van Stijn 1e8aef0b45 Merge pull request #23633 from thaJeztah/fix-advisory-meta 
docs: move "advisory" to  general metadata
Upstream-commit: ef9c058b67b181fc5084ead0bafcca410863726c
Component: engine
 2016-06-16 14:55:11 -07:00
Stephen J Day 73e75a98de api/client/service: fix minor spelling error in service inspect 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 920e65ccbca0423c43579c9ce3b9331efe14c97b
Component: engine
 2016-06-16 14:54:41 -07:00
Victor Vieux 51ddeadfa4 Merge pull request #23537 from tiffanyfj/update-cli 
Capitalized Docker and Swarm for consistency
Upstream-commit: 348a7c790cca349d110bb76dfd6522cbd6579ea3
Component: engine
 2016-06-16 14:43:15 -07:00
Madhu Venugopal 611e95b628 Merge pull request #23635 from sainath14/network_id_missing 
Fixes #23596-returns empty string for NetworkID
Upstream-commit: 262081557b8ef9d4c0244170152fa9bee8962166
Component: engine
 2016-06-16 14:38:51 -07:00
Tõnis Tiigi 40a223da0a Merge pull request #23613 from stevvooe/running-over-replicas 
api/client/service: list running services over replicas
Upstream-commit: 70c7328d9e97ab271bd4529480bdc7cc202faccf
Component: engine
 2016-06-16 14:34:13 -07:00
Madhu Venugopal c73117810f Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed 
* fixes https://github.com/docker/docker/issues/23622
* fixes a memory leak issue with bulk sync
* fixes external DNS resolution issue after live restore

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 7f2f6ed0d6f19bb6cedb6e59d410d0704636ce54
Component: engine
 2016-06-16 14:33:36 -07:00
Tõnis Tiigi 7b4f900246 Merge pull request #23606 from vieux/fix_secrets 
fix docker swarm init/update --secret
Upstream-commit: 657703178798ac497a82c16b4fd9f1c0728c60f9
Component: engine
 2016-06-16 14:24:35 -07:00
Tibor Vass 0c8b7ed055 Merge pull request #23636 from crosbymichael/hang 
Set systemd KillMode
Upstream-commit: 5d62f642d91e5ef3a751a41be8924e861beceb7f
Component: engine
 2016-06-16 14:17:29 -07:00
Sebastiaan van Stijn 5dd25b20b2 Merge pull request #23634 from thaJeztah/fix-api-menu-order 
Fix API 1.25 order in menu
Upstream-commit: 312749435b2415aeb14f21c89ccd9e3aeb833455
Component: engine
 2016-06-16 13:31:32 -07:00
Tonis Tiigi f2801c549b Add api tests for secret update 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: aed7667bee243b0e0d1aa480e3bb52bae894cfe5
Component: engine
 2016-06-16 13:21:55 -07:00
Tibor Vass 84d615e247 Merge pull request #23491 from thaJeztah/update-release-instructions 
Update release script installation instructions
Upstream-commit: e2feff465c737f611a48420fc4c5b38b2c897d88
Component: engine
 2016-06-16 12:57:46 -07:00
Sainath Grandhi fc39b62384 Fixes #23596-returns empty string for NetworkID in response to /containers/json 
Signed-off-by: Sainath Grandhi <sainath.grandhi@intel.com>
Upstream-commit: ad85d299066e87cd40afc43ffee8cb73dcc79eb4
Component: engine
 2016-06-16 12:34:00 -07:00
Victor Vieux 64bc8958f7 Merge pull request #23581 from dnephin/better-opt-strings 
Better output of default value for service option types
Upstream-commit: 354f16e25062a283b077f6fa414e61abbdffe074
Component: engine
 2016-06-16 12:24:03 -07:00
Sebastiaan van Stijn c0b4786bbf Fix API 1.25 order in menu 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6891fead3675a31a9a98a0f19a80c96ebc393afd
Component: engine
 2016-06-16 12:07:29 -07:00
Sebastiaan van Stijn f500e226f4 Update release script installation instructions 
Instructions for installing the static binaries
has changed, so updated the instructions.

The comment on top already requires the steps
to be executed as root, so removing the 'sudo'

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e233c8dd7208b358b950731a6ba93cf9dcb80eb5
Component: engine
 2016-06-16 11:58:29 -07:00
Sebastiaan van Stijn bcf7be1ed0 docs: move "advisory" to general metadata 
the advisory option should not be
below "menu"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: aadd88c306d43b401a18a29efafa714f64f87894
Component: engine
 2016-06-16 11:52:34 -07:00
Michael Crosby 55c05646ce Set systemd KillMode 
Change the kill mode to process so that systemd does not kill container
processes when the daemon is shutdown but only the docker daemon

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: db435f526ac5703276ad1add28188c0c8c6e4c2a
Component: engine
 2016-06-16 11:46:04 -07:00
Alexander Morozov b088238272 Merge pull request #23609 from Microsoft/WindowsMemory 
Windows: Re-enabled support for memory limit
Upstream-commit: 1f3efe67764b6f8616dd12271747863c17f36f30
Component: engine
 2016-06-16 10:08:17 -07:00
Sebastiaan van Stijn b1012f71f3 Merge pull request #23568 from adrianmoisey/patch-1 
Fix URL to issue
Upstream-commit: 3acb0e4292b23a30fd949e473ba798e2c343d869
Component: engine
 2016-06-16 10:03:11 -07:00
Sebastiaan van Stijn 7f85b4490c Merge pull request #23623 from SvenDowideit/fix-rc-advisory 
advisory can't be in the [menu] section
Upstream-commit: b62d5dfbf3cf1be01df376334ed9f896030c1bd1
Component: engine
 2016-06-16 10:01:49 -07:00
Arnaud Porterie 1c213e077b Merge pull request #23625 from talex5/fix-health-test 
Remove out-of-date health test
Upstream-commit: 3d69595a3189d15aaab82b0721508e640b26ccd0
Component: engine
 2016-06-16 15:52:04 +00:00
Daniel Nephin 8220c21f1c Fix String() for some option types 
and add unit tests for them.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c26e7d8c9105e16048268a01dd1e556af43902cd
Component: engine
 2016-06-16 10:09:14 -04:00
Thomas Leonard c4c90efda6 Remove out-of-date health test 
The test was waiting for the container to exit after failing its
healthcheck. However, we no longer automatically terminate containers,
so this waited instead for the container to time-out by itself.

Signed-off-by: Thomas Leonard <thomas.leonard@docker.com>
Upstream-commit: 18a59bb8691c6f6f6a7a86f56bbcfc5418509ed8
Component: engine
 2016-06-16 13:09:57 +01:00
Sven Dowideit e787e67ec5 advisory can't be in the [menu] section 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: bc033cb706fd22e3934968b0dfdf93da962e36a8
Component: engine
 2016-06-16 11:59:47 +00:00