toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,594 Commits 3 Branches 295 Tags
e32705bbc77b48aaee2cc116432899877fa7fe78
Commit Graph
22594 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester e32705bbc7 Merge pull request #20480 from wenchma/20431-filter_since_before 
Enhancement of docker ps before and since filters
Upstream-commit: 9eb4575f8cdb8f9afb0d53d6fd4a34b077cc08da
Component: engine
 2016-02-29 20:57:43 +01:00
David Calavera 7d62a9ef68 Merge pull request #20780 from runcom/revert-sudo-user 
Revert sudo user
Upstream-commit: a5d98b82ea641349640d07b2f62a047b94592a5e
Component: engine
 2016-02-29 11:48:24 -08:00
David Calavera f3c9f69224 Merge pull request #20307 from HuKeping/trust 
Refactor trust push
Upstream-commit: 1ba0358a10e6ad61832a47ac2f99dda7a7d57429
Component: engine
 2016-02-29 11:12:09 -08:00
David Calavera 6324c7793e Merge pull request #20605 from mountkin/optimize-json-log-writer 
make the json log writer much faster
Upstream-commit: ba5a282a83a603c3bb61cd40642af54d2088f747
Component: engine
 2016-02-29 10:47:46 -08:00
Brian Goff 70ddfe143d Merge pull request #20749 from mountkin/validate-log-opts 
validate log-opt when creating containers
Upstream-commit: 2391794d2695079f2dd19b10cd51aea6922b3ec9
Component: engine
 2016-02-29 13:47:25 -05:00
David Calavera 569a4e8006 Merge pull request #20686 from clintonskitson/bugfix/plugin_desc_leak 
Fix plugin file descriptor leaks
Upstream-commit: 29b2b0c22ba4a9c81002cd70e464ef0cfc577413
Component: engine
 2016-02-29 10:44:36 -08:00
David Calavera a2d2add430 Merge pull request #20787 from itsthenetwork/Fix-Seccomp-Readme 
Update seccomp.md
Upstream-commit: b1955a66f536dfb8fe15d00059ae527f49c35ba9
Component: engine
 2016-02-29 09:54:48 -08:00
Sebastiaan van Stijn 66f153da0f Merge pull request #20774 from hqhq/hq_vender_engine_api 
Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c
Upstream-commit: b211e57f23848bd1990db84d2ccce0ce529e735a
Component: engine
 2016-02-29 18:48:55 +01:00
Steven Iveson 2932936552 Update seccomp.md 
Corrected titles to use title case. Added link to default.json and some numerical detail. Changed example JSON to a portion of the actual default file, with the correct defaultAction.

Signed-off-by: Steven Iveson <steven.iveson@infinityworks.com>
Upstream-commit: 244e5fc51653b47a974ad111022ea923ddebaf05
Component: engine
 2016-02-29 16:32:45 +00:00
Vincent Demeester 4cc9b2c995 Merge pull request #20777 from Anonymooseable/document-plugin-types 
Document interfaces a plugin can implement
Upstream-commit: c0c10daebf2372fdc2ca46c6535e1daac628ab48
Component: engine
 2016-02-29 17:31:06 +01:00
Tibor Vass cf5a003364 Merge pull request #20737 from mikedougherty/install-sh-multiple-keyservers 
Use multiple keyservers in install script
Upstream-commit: 0573b814a1e78cf0e6fefc8ecd3913a95e849506
Component: engine
 2016-02-29 11:17:13 -05:00
Linus Heckemann 1de8cdf35e Remove experimental GraphDriver plugin type 
Signed-off-by: Linus Heckemann <anonymouse2048@gmail.com>
Upstream-commit: 3ef13258289ef01102c0ae01a8d9af49d36441fb
Component: engine
 2016-02-29 15:59:54 +00:00
Vincent Demeester cee58ed27a Merge pull request #20629 from wallnerryan/intro-volumes 
Intro volume drivers in dockervolumes.md
Upstream-commit: 6c01d2a0cf4feb24bddf6830fd1683060c0ff309
Component: engine
 2016-02-29 16:59:43 +01:00
Ryan Wallner 47e8179868 intro volume plugins in userguide volumes 
NOTE should be lowercase

Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com>

add link to list of plugins

Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com>

address changres

Signed-off-by: Ryan Wallner <ryan.wallner@clusterhq.com>
Upstream-commit: b6fdcd3a342dc882955253e0a39711ed4ac078fc
Component: engine
 2016-02-29 10:56:32 -05:00
Tibor Vass 45b2db0eaa Merge pull request #20773 from Microsoft/jjh/testunitdockerlayer 
Windows CI Unit Test: Docker layer turn off failing tests
Upstream-commit: eb22fcc229b364dd4429823c96b8f2e585e73217
Component: engine
 2016-02-29 10:46:32 -05:00
Tibor Vass 1922dbc3eb Merge pull request #20772 from Microsoft/jjh/testunitdistribution-xfer 
Windows CI Unit Test: Distribution\xfer turn off failing tests
Upstream-commit: 8ffec1fca5d851e9f8e33e3dfab5c6ebc9562284
Component: engine
 2016-02-29 10:45:57 -05:00
Brian Goff 4b3ca35355 Merge pull request #20602 from twistlock/20508_authz_plugin_corrupt_body 
Fix #20508 - Authz plugin enabled with large text/JSON POST payload corrupts body
Upstream-commit: abbb16d7abd7150a9226252f2544326930ea2baf
Component: engine
 2016-02-29 10:43:02 -05:00
Brian Goff 8c7db25ed0 Merge pull request #20756 from runcom/no-dash-d-tests 
integration-cli: remove not necessary -d again
Upstream-commit: 7cea7c698d39adb9757ee59beed59f114c88f132
Component: engine
 2016-02-29 09:47:49 -05:00
Vincent Demeester c247f38736 Merge pull request #20736 from elchris82/master 
Changed the Example request in Remote API reference to connect a container to a network
Upstream-commit: 79c24a082004251bd899b8bd549da43e3abca10d
Component: engine
 2016-02-29 15:06:20 +01:00
Antonio Murdaca 3bd6e595b8 cliconfig: use a const for ".docker" string 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 565712014f3dfe01b0b5012ab46a7e26217538f2
Component: engine
 2016-02-29 14:44:01 +01:00
Antonio Murdaca c762170458 Revert "resolve the config file from the sudo user" 
This reverts commit afde6450ee7bd4a43765fdc0a9799b411276d9e4.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 863b5716173db320ddc03847a639964f495a7953
Component: engine
 2016-02-29 13:51:43 +01:00
Sebastiaan van Stijn 351fe56c91 Merge pull request #20771 from Microsoft/jjh/disableunittestsdistribution 
Windows CI Unit Test: Distribution turn off failing tests
Upstream-commit: da4f2ce6294f9333a7b9011f80d7b64815cc2059
Component: engine
 2016-02-29 12:56:10 +01:00
Qiang Huang 98394b0b6e Vendor engine-api to 70d266e96080e3c3d63c55a4d8659e00ac1f7e6c 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 53b0d62683ee798198c553353dc2106623a9259b
Component: engine
 2016-02-29 19:28:37 +08:00
Linus Heckemann cbd8a29659 Document interfaces a plugin can implement 
Signed-off-by: Linus Heckemann <lheckemann@twig-world.com>
Upstream-commit: dd729efe028667b2180922e2c7e649a5b8ec52e9
Component: engine
 2016-02-29 09:43:44 +00:00
Vincent Demeester b26295c87c Merge pull request #20776 from terryding77/doc_changes 
change container word spell in docs
Upstream-commit: ffd8a0e0fbaaf4f8dbaea66c3e06a8dc24dc22ca
Component: engine
 2016-02-29 10:38:06 +01:00
terryding77 7294d486c4 change container word spell in docs 
Signed-off-by: terryding77 <550147740@qq.com>
Upstream-commit: adda1060aa3c7a41fddc4cdeaac92f946c40e2d8
Component: engine
 2016-02-29 16:59:53 +08:00
Antonio Murdaca 4eae9fd26d Merge pull request #20753 from icecrime/debugging_win2lin 
Fix client-side race in `docker stats`
Upstream-commit: 5ef74c65956eaf59bc1c4537f5244f56b37ef531
Component: engine
 2016-02-29 08:20:17 +01:00
Vincent Demeester 5f0c16d34d Merge pull request #20604 from coolljt0725/fix_reload 
Fix configuration reloading
Upstream-commit: 20a038eca68e4188e1cd812293aea8cb220cf08f
Component: engine
 2016-02-29 07:14:15 +01:00
John Howard 4c31288f7a Windows CI Unit Test: Docker layer turn off failing tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e17cb9b721ec10d5be36f380c23ee2d448bd135a
Component: engine
 2016-02-28 20:16:10 -08:00
John Howard cdf59b59f2 Windows CI Unit Test: Distribution\xfer turn off failing tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: dd2ff281bf62037948a9da18dd2223b977056a4e
Component: engine
 2016-02-28 20:08:34 -08:00
John Howard f53e7a1a3f Windows CI Unit Test: Distribution turn off failing tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 621a1b9aca7f0ad2ac6b83f990644c3dc983d659
Component: engine
 2016-02-28 20:02:51 -08:00
Arnaud Porterie 26d7a7de66 Fix client-side race in docker stats 
Subscribe to events and monitor for new containers before the initial
listing of currently running containers.

This fixes a race where a new container could appear between the first
list call but before the client was subscribed to events, leading to a
container never appearing in the output of `docker stats`.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 3041aa53efbbfddbc10a66027d973bd353e3b525
Component: engine
 2016-02-28 18:44:23 -08:00
Sebastiaan van Stijn 47c5b544ef Merge pull request #20760 from vdemeester/fix-cliconfig 
Fixing cliconfig getDefaultConfigDir
Upstream-commit: 67a77934a436e9995a5322178db7cea56a9458dc
Component: engine
 2016-02-29 00:19:06 +01:00
Sebastiaan van Stijn ab5d00b5e0 Merge pull request #20757 from spacediver/patch-1 
fixed formatting; added handy -y to apt-get install
Upstream-commit: ab18b5977a2e12a425bfe4961f58784e450fd0d0
Component: engine
 2016-02-28 23:55:03 +01:00
Sebastiaan van Stijn 5548386ebd Merge pull request #20759 from toogley/master 
add google group subscribtion method using only emails
Upstream-commit: 0866d63278b250cd19d560aa748941be24246a45
Component: engine
 2016-02-28 19:17:00 +01:00
Pavel Sutyrin bd7351183c fixed formatting; added handy -y to apt-get install 
Signed-off-by: Pavel Sutyrin <pavel.sutyrin@gmail.com>
Upstream-commit: 30c2770a736e6c731f4046431f0f4275dadbd536
Component: engine
 2016-02-28 20:37:04 +03:00
Vincent Demeester c006d48f55 Fixing getDefaultConfigDir 
It seems it's not really checking the right folder.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d3fd0974d558aa994f9f5da7ff84dceb2c7e1c90
Component: engine
 2016-02-28 16:04:48 +01:00
toogley 21e60713b2 add google group subscribtion method using only emails 
* users don't have to create an google account for using the google groups. They
  can simply email to e.g. "docker-user+subscribe@googlegroups.com" to
  subscribe.

* since this behavior is not mentioned on the google group website, i think its
  a good idea to explain this method here.

Signed-off-by: toogley <toogley@mailbox.org>
Upstream-commit: e3e18584b0552159324d93cb394b04594057adbc
Component: engine
 2016-02-28 15:31:15 +01:00
Antonio Murdaca f444846f4e integration-cli: remove not necessary -d again 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: e44689139d2ffd08c147ffe940a15a8e8616786a
Component: engine
 2016-02-28 13:48:15 +01:00
Brian Goff 7ca3972412 Merge pull request #20748 from runcom/remove-dash-d 
integration-cli: remove not necessary -d
Upstream-commit: 38439733d2415f2d12290bf5bf8b7c1133557f79
Component: engine
 2016-02-27 21:58:15 -05:00
Brian Goff 79c9ac5435 Merge pull request #20706 from calavera/remove_concurrent_access_to_stdtypes 
Make stdcopy.StdWriter thread safe.
Upstream-commit: ec268be52ee3a2fab5c792ecf836f109595712ae
Component: engine
 2016-02-27 21:14:09 -05:00
Arnaud Porterie 2d692cbf2f Merge pull request #20752 from icecrime/fix_experimental_cross 
Pin tpoechtrager/osxcross commit
Upstream-commit: 15bdca6addef2cc3918a3c56685cc6cd81cfbab5
Component: engine
 2016-02-27 17:43:43 -08:00
Arnaud Porterie 588f1dc8ae Pin tpoechtrager/osxcross commit 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 2140650b56342898f7efb700bf4a681073b64ee5
Component: engine
 2016-02-27 12:04:49 -08:00
Shijiang Wei c3440ba69f validate log-opt when creating containers 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 7285c9a53a6a661e7ded4637d937f9d20dcf46c0
Component: engine
 2016-02-28 01:51:46 +08:00
Antonio Murdaca d0b8a125f5 integration-cli: remove not necessary -d 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: faf4604dac41b4fdb88b3e6552d24d5ea5e3f16c
Component: engine
 2016-02-27 18:27:25 +01:00
Arnaud Porterie 9b7901fe87 Merge pull request #20742 from cpuguy83/revert_aufs_fine_locks 
Revert aufs fine locks
Upstream-commit: c7d6f0c30c824e27f3bf4dd846a68b04544d5a15
Component: engine
 2016-02-27 08:53:04 -08:00
Arnaud Porterie 97a39565a4 Merge pull request #20734 from cpuguy83/fix_flakey_test 
Fix flakey TestStatsAllNewContainersAdded
Upstream-commit: c24d4e8ab4a477eaaa90716e87a076bc6fc6f49c
Component: engine
 2016-02-27 07:52:18 -08:00
Brian Goff a63e28ad6f fix double-lock 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e386dfc33fc1fd5ed06496bd19f01a37c3c46341
Component: engine
 2016-02-27 09:49:21 -05:00
Vincent Demeester 3dc80838d5 Merge pull request #20739 from LK4D4/keys_config 
Add CONFIG_KEYS to check-config.sh
Upstream-commit: 3f4e49aa618800396da87784211e4e02c5509551
Component: engine
 2016-02-27 14:33:54 +01:00
Brian Goff f76950a71a Revert "Add finer-grained locking for aufs" 
This reverts commit f31014197cbe9438cc956ed12c47093a0324c82d.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c2f7777603039b0e9b7e8fcdf517b1486dc14781
Component: engine
 2016-02-27 08:01:19 -05:00