toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,461 Commits 3 Branches 295 Tags
12a0699a2c21f705cc40bf02c9bf4243dc42daa7
Commit Graph
22461 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rory McCune 12a0699a2c Update security.md with basic User Namespace info. 
Just some suggested wording to update this page to take account of User Namespaces being available as of 1.10.

Signed-off-by: Rory McCune <rorym@mccune.org.uk>
Upstream-commit: c1e53ad1aa9d82568efc045444a5df76b1471905
Component: engine
 2016-02-24 20:53:00 +00:00
Alexander Morozov ab6aa3583c Merge pull request #20641 from cpuguy83/revert_inotify_changes 
Revert fsnotify changes
Upstream-commit: a7fefcf16cda4f91b9526b4db6d06ef12652f419
Component: engine
 2016-02-24 10:10:03 -08:00
Arnaud Porterie 148812de36 Merge pull request #20637 from Microsoft/jjh/fixteststartattachmultiplecontainers 
Windows CI: Fix TestStartAttachMultipleContainers
Upstream-commit: 467c8b1a6a866081081a90ea9cec94640638781a
Component: engine
 2016-02-24 08:46:00 -08:00
Brian Goff 828abfa863 add file poller panic fix from 1.10.2 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f9524a4d24d6135ae1777738390e1f6a590a7a1c
Component: engine
 2016-02-24 10:17:29 -05:00
Sebastiaan van Stijn 8b47d652ee Merge pull request #20649 from runcom/fedora-update-userns 
docs: reference: commandline: daemon: fedora 23+ has mapping files
Upstream-commit: efb915800aa6595e24f39ed58d95d5ab5db02f7a
Component: engine
 2016-02-24 16:04:02 +01:00
Antonio Murdaca 97222044b9 docs: reference: commandline: daemon: fedora 23+ has mapping files 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: eb902ef25773ca670eee126351547e77f384ad9d
Component: engine
 2016-02-24 15:43:28 +01:00
Sebastiaan van Stijn 8075c13623 Merge pull request #20619 from Microsoft/jjh/useraccounts 
Windows: Updates for virtual user account
Upstream-commit: 5fdfb2985b209660a1a540222f614b73a0dc2e63
Component: engine
 2016-02-24 13:48:27 +01:00
Sebastiaan van Stijn 9e37627565 Merge pull request #20643 from estesp/userns-chkconfig-redhat 
Add check for RHEL7/CentOS7 experimental userns disabled
Upstream-commit: 2cc54a2e5735aa052884fce2e6674285c3853473
Component: engine
 2016-02-24 11:42:26 +01:00
Sebastiaan van Stijn 34876f5fef Merge pull request #20017 from calavera/expose_volumes_in_ps 
Add mounts to docker ps.
Upstream-commit: 034a1a8dfd17d89123bf0405f898e880575ed775
Component: engine
 2016-02-24 11:08:21 +01:00
Phil Estes 71bd1b6405 Add check for RHEL7/CentOS7 experimental userns disabled 
Add a check in `check-config.sh` to see if we are running on a RHEL7 or
CentOS7 system, which may report that CONFIG_USERNS is OK/enabled, but
user namespaces still won't work because of the experimental feature
flag added by Redhat.

This will add a warning if it is actually disabled and notes what has to
be added to the grub/boot command line to enable it.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 23551515564b54128e882dda5eae659883947d39
Component: engine
 2016-02-23 23:28:24 -06:00
Brian Goff 0a8b8e629c Revert "use pubsub instead of filenotify to follow json logs" 
This reverts commit b1594c59f5e0d1ac898eacde8d91b1ba33c2b626.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 91fdfdd53722179b21b80b9dfbe8bc2e09d0a7b1
Component: engine
 2016-02-23 21:43:52 -05:00
Brian Goff 165355ea85 Revert "pkg: remove unused filenotify" 
This reverts commit ee99b5f2e96aafa982487aadbb78478898ae0c71.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f78091897a9926399224886788c373b4ff9d14bf
Component: engine
 2016-02-23 21:43:46 -05:00
Brian Goff 19b1f464fe Revert "vendor: remove fsnotify" 
This reverts commit bc195e1558d3091dccb209f1bb35115248886c7a.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d3bffa1639655b9d0f96b8ef4b1842663e7d2741
Component: engine
 2016-02-23 21:43:27 -05:00
Arnaud Porterie 8a6f94c5b2 Merge pull request #20631 from LK4D4/update_libcontainer 
Update libcontainer to 2c3115481ee1782ad687a9e0b4834f89533c2acf
Upstream-commit: 2d0c3d1328cf1f10a4f4db7015e4ff1c9f7779ae
Component: engine
 2016-02-23 16:24:46 -08:00
John Howard ca915e8020 Windows CI: Fix TestStartAttachMultipleContainers 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ef9f13af3d9293458a03223a030028381da4ae09
Component: engine
 2016-02-23 16:24:35 -08:00
Arnaud Porterie 271b18177c Merge pull request #20627 from tophj-ibm/fix-flaky-oom-tests 
Fix flaky OOM tests
Upstream-commit: a9e627422458a530a9af8fd01d7838eec51b03ab
Component: engine
 2016-02-23 15:37:32 -08:00
David Calavera d7e2b23289 Merge pull request #20610 from justechn/fix_docs 
Fix docs
Upstream-commit: 2ed1806b2c563e2276d81066cc492aaf7bcb145b
Component: engine
 2016-02-23 13:45:29 -08:00
Alexander Morozov ee3aee350a Update libcontainer to 2c3115481ee1782ad687a9e0b4834f89533c2acf 
It includes fix for parsing systemd cgroup names

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 4fc5bd295eedbefe1b429d98be52f794f1461f2f
Component: engine
 2016-02-23 13:37:20 -08:00
Christopher Jones 15f2e840f7 Fix flaky OOM tests 
If cgroup swap memory limit isn't enabled, then
the -m flag doesn't work and the container that is created for
both of these tests is very large. Because we are trying to run the
containers out of memory, this takes a very long time and causes the
tests to fail most of the time.

Follow-up to #17913

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 3abf2a77414195d5b0c15f7fc88b7fd9aa4edaa8
Component: engine
 2016-02-23 15:26:26 -05:00
Tibor Vass 777176f166 Merge pull request #20618 from icecrime/fix_TestExec 
Fix flaky TestExec
Upstream-commit: 9ec015edff663d16625d18cf0d52644d94f5cec7
Component: engine
 2016-02-23 13:44:04 -05:00
Ryan McLaughlin e61c546929 fixing the path of the key pair 
Signed-off-by: Ryan McLaughlin <ryanmclaughlin@gmail.com>

Fixed a bit of grammar

Signed-off-by: Ryan McLaughlin <ryanmclaughlin@gmail.com>
Upstream-commit: d14cef441d05f01e8f253c67ff11f954aa24a142
Component: engine
 2016-02-23 11:32:28 -07:00
Arnaud Porterie c1d2fd21f7 Fix flaky TestExec 
The container started with `-d` as part of the test requires a `waitRun`
to ensure it is actually running before attempting any other operation.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 0a7755ab4e2fc8df1992813d5364fe0f201ab913
Component: engine
 2016-02-23 09:51:09 -08:00
John Howard e1a3cdb877 Windows: Updates for virtual user account 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 800c9e81ea9093d587c18bc5c1fd7c0a73b1293f
Component: engine
 2016-02-23 09:47:52 -08:00
David Calavera edf220176a Add mounts to docker ps. 
- Allow to filter containers by volume with `--filter volume=name` and `filter volume=/dest`.
- Show their names in the list with the custom format `{{ .Mounts }}`.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: bd4fb00fb6241d35537b460a2d9f48256111ae7a
Component: engine
 2016-02-23 12:10:24 -05:00
Brian Goff cecf6d8a1a Merge pull request #20591 from nerdalert/logrus_dbg_msg 
Fixed logrus client/server mismatch debug msg
Upstream-commit: 0f18fa939c18da5fd7385d25f10666fe486704b1
Component: engine
 2016-02-23 11:59:37 -05:00
Vincent Demeester 5ff2aad20c Merge pull request #20613 from aidanhs/aphs-ipv6-docs-followup 
Update docs for enableipv6
Upstream-commit: 20fc13b56deb4fc28cbd40ae3c67e5ca2dd9592a
Component: engine
 2016-02-23 17:57:58 +01:00
David Calavera 39d894b6e8 Merge pull request #20581 from stweil/master 
Fix some typos in comments and strings
Upstream-commit: 9d882cbb442138cb5c9026f1ec8eb4499ad71442
Component: engine
 2016-02-23 08:20:53 -08:00
David Calavera 15b7542c40 Merge pull request #20590 from HackToday/fixdoc 
Fix doc format issue
Upstream-commit: 1e02a0810ee51ec7fa572f9e35ba36cd32d7a083
Component: engine
 2016-02-23 08:20:03 -08:00
Aidan Hobson Sayers 13fc2a2541 Update docs for enableipv6 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 82d486848dd2e7a0189375a62e8e38171ba9a2b1
Component: engine
 2016-02-23 16:10:54 +00:00
Sebastiaan van Stijn afe701cabe Merge pull request #20597 from zhuguihua/fix_markdown_style_error_in_man_page 
Fix markdown style error in man page
Upstream-commit: 98d6dedde39902e15def644ca70be8fecef9758d
Component: engine
 2016-02-23 16:15:46 +01:00
Sebastiaan van Stijn 2c0688c9b3 Merge pull request #20514 from calavera/github_templates 
Add tempates for new issues and pull requests.
Upstream-commit: f3b5fdc23db46abaf6ec7aa731d639cbc15f0921
Component: engine
 2016-02-23 15:27:52 +01:00
Vincent Demeester 11a259a09b Merge pull request #20500 from ZJUshuaizhou/master 
Update docker_remote_api_v1.22.md
Upstream-commit: 783d6c64cfd1a413cd8ce500611d0aa23ded8cb1
Component: engine
 2016-02-23 14:54:01 +01:00
Doug Davis febccfa928 Merge pull request #20598 from wenchma/typo 
Fix typo
Upstream-commit: dbec35ffd37bc00e8438f752841b43ab41cdf3d5
Component: engine
 2016-02-23 07:28:50 -05:00
Wen Cheng Ma f04054d6f5 Fix typo 
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 8474bbff4594f382dbac5ad59767d18b2d8f2689
Component: engine
 2016-02-23 17:27:55 +08:00
Zhu Guihua 42f2e41e4a Fix markdown style error in man page 
Signed-off-by: Zhu Guihua <zhugh.fnst@cn.fujitsu.com>
Upstream-commit: 2aa4280d936b6680dedbe3a3ebf34f8640626306
Component: engine
 2016-02-23 16:10:17 +08:00
ZJUshuaizhou c78bf4e1c8 update all the versions from v1.19 to v1.23 
update v1.22

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

update all the versions docs

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

revert v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

update v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

revert v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>

update v1,20

Signed-off-by: ZJUshuaizhou <21551191@zju.edu.cn>
Upstream-commit: 220a188ae820fac1198c54b7f0358525457a8609
Component: engine
 2016-02-23 14:34:27 +08:00
Brent Salisbury b49176ac83 Fixed logrus client/server mismatch debug msg 
Signed-off-by: Brent Salisbury <brent@docker.com>
Upstream-commit: a499ad8e4e596d21167347437a2ca3098cbadc45
Component: engine
 2016-02-22 23:36:33 -05:00
Kai Qiang Wu(Kennan) d01d130fdc Fix doc format issue 
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 4d4d1e7f82592c4996650b92b01d9f4633e8878b
Component: engine
 2016-02-23 03:42:10 +00:00
Brian Goff 0a2d56c7a2 Merge pull request #20588 from WeiZhang555/typo 
Fix typo
Upstream-commit: 0d808683a1e1a7c9971d2b943028d0a621d2eb21
Component: engine
 2016-02-22 21:30:01 -05:00
Zhang Wei ce26dfb6b0 Fix typo 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 2264bd95b681d1336b167c8ecd9b2ce65b963071
Component: engine
 2016-02-23 10:25:24 +08:00
David Calavera cef2f0b8f9 Merge pull request #20579 from MHBauer/cleanup 
consistent variable names in api/server/router
Upstream-commit: 921c744bc3b3ed2ae22cf460422604730dc5ae22
Component: engine
 2016-02-22 15:20:48 -08:00
David Calavera 239fee91e2 Add tempates for new issues and pull requests. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9cac2716f7196fc915c4cac3b2c34aa2183182d9
Component: engine
 2016-02-22 14:59:50 -05:00
Stefan Weil f62b97e499 Fix some typos in comments and strings 
Most of them were found and fixed by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Upstream-commit: 2eee613326fb59fd168849618d14a9054a40f9f5
Component: engine
 2016-02-22 20:27:15 +01:00
Morgan Bauer 583166cc10 consistent variable names in api/server/router 
- banish 'daemon'

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 90215065024aea1001e42e7a427248630b4a1115
Component: engine
 2016-02-22 10:53:47 -08:00
Brian Goff 5cbc7c5628 Merge pull request #20552 from Microsoft/jjh/dockerfilereliability 
Windows CI: Making dockerfile WAAAAAY faster
Upstream-commit: 40397d8059594ac58250f66f93f4c28455433242
Component: engine
 2016-02-22 13:11:23 -05:00
Vincent Demeester ef752fd250 Merge pull request #20557 from hsinko/fix_api_docs 
Fix tiny error. And Previous PR missed to update docker_remote_api v1.22 and v1.23
Upstream-commit: 4a087e4e6b348e96e20699bf11af8058d04b2ae3
Component: engine
 2016-02-22 14:43:50 +01:00
hsinko 4baeda8a40 Update docker_remote_api_v1.22.md and v1.23 to complete the docs 
Signed-off-by: hsinko <21551195@zju.edu.cn>

id in example request should be a exact value

Signed-off-by: hsinko <21551195@zju.edu.cn>

revert v1.22 doc

Signed-off-by: hsinko <21551195@zju.edu.cn>

fix tiny errors

Signed-off-by: hsinko <21551195@zju.edu.cn>
Upstream-commit: 5642cdeac5df08414744203235462a6b99261239
Component: engine
 2016-02-22 20:49:10 +08:00
Vincent Demeester 15ccd7ba01 Merge pull request #20562 from albers/completion-update--restart 
Add bash completion for `docker update --restart`
Upstream-commit: 5d33ff7e9d6703df9ac658d8aa6f253a6bb1ae32
Component: engine
 2016-02-22 13:44:31 +01:00
Vincent Demeester 5b0eb0d2e2 Merge pull request #20561 from albers/completion-etwlogs 
Add bash completion for etwlogs logging driver
Upstream-commit: 0542f66823d1f8043f3ba352e8b71957032f92e6
Component: engine
 2016-02-22 13:42:46 +01:00
Vincent Demeester db2af42164 Merge pull request #20482 from zhuguihua/fix_storage_driver_options_in_man_page 
fix storage driver options in man page
Upstream-commit: 074442df7a542f8604d28e38139488cae196f7d4
Component: engine
 2016-02-22 10:40:52 +01:00