toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,634 Commits 3 Branches 295 Tags
e740d4f911781f2dc0127f1663de238d109efd2d
Commit Graph
22634 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester 0876b5f9e5 Merge pull request #17808 from bboreham/ipc-errormsg 
Fix typo in container-start error message
Upstream-commit: 944dc7fa8f2a91fef664e858d53d6bb7d3796266
Component: engine
 2015-11-09 07:58:03 +01:00
Vincent Demeester 4ba9dc1b18 Merge pull request #17817 from Microsoft/jjh/contained 
Typo s/contained/container
Upstream-commit: c13ca529d3f4ba23f4eb143a29cde01db688afca
Component: engine
 2015-11-09 07:55:44 +01:00
Harald Albers 63a8bacd69 Fix bash completion on systems where extglob is not set 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 211e3b0df67d17989c7aff63d1a0098ad61f07a3
Component: engine
 2015-11-08 22:31:16 -08:00
John Howard 56752590f4 Typo s/contained/container 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2ff68910e2ac3e16d47de2b95a412e07586a7c60
Component: engine
 2015-11-08 18:29:34 -08:00
Lei Jitang c27bddf6a0 Prevent connecting to host and prevent disconnecting from host 
Container has private network namespace can not to connect to host
and container with host network can not be disconnected from host.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: a2d8c93fc690c2244a3bed32a2bbeb8dae449f90
Component: engine
 2015-11-09 10:19:53 +08:00
Lei Jitang e5d27b4461 Remove DOCKER_EXECDRIVER env 
Since --exec-driver flag has been removed, we don't need environment
DOCKER_EXECDRIVER in integration-cli and Makefile any more.

Signed-off-by: Lei Jitang <leijiang@huawei.com>
Upstream-commit: 3c4dab51d33f6e90c45de83c01474bc60aee3766
Component: engine
 2015-11-09 09:17:32 +08:00
Brian Goff d17a8d57a6 Un-export non-externally used functions 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d7a41325fab570b223ef55f31a30fd9ecce75bc1
Component: engine
 2015-11-08 15:51:27 -05:00
Bryan Boreham 3fb74544b6 Fix typo in error message 
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: 93405dd037ffb54e7e72d9d36be4a16d1d76fa50
Component: engine
 2015-11-08 18:05:34 +00:00
Harald Albers 576351b40d Align configuration of bash completion with existing values 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8311db14fc2b71b5fd67f23527c3fd09a3addc85
Component: engine
 2015-11-08 09:35:48 -08:00
Doug Davis a673ae3b5d Merge pull request #17801 from cpuguy83/remove_dead_graph_code 
Remove dead graph code
Upstream-commit: e357be4abe271f338d544e2ce8917ef3892ccfa3
Component: engine
 2015-11-08 12:33:27 -05:00
Antonio Murdaca 62005e81e4 Merge pull request #17762 from LK4D4/builder_commit 
Use name instead of container in Commit
Upstream-commit: 343c8547df8154a0e6772fb3acc881e03dc86452
Component: engine
 2015-11-08 15:57:13 +01:00
Brian Goff 0d6bf3de51 Remove dead graph code 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 8c08002a10ddd7745ff1df196618c64b8275d102
Component: engine
 2015-11-08 08:57:54 -05:00
Brian Goff 164600687f Merge pull request #17793 from haoshuwei/modify-improper-comments-on-volume-file 
Modify improper comments in api/server/router/volume/volume.go
Upstream-commit: 70b3ce17b750487ce9b28e093f1f05e7c00efc28
Component: engine
 2015-11-08 07:24:48 -05:00
Antonio Murdaca 35be647e0b Merge pull request #17792 from cpuguy83/graph_use_locker_pkg 
Replace `imageMutex` with `Locker` pkg
Upstream-commit: e4d8ea0087eaab16eda4bb017ff68c67a61ee538
Component: engine
 2015-11-08 12:11:20 +01:00
Jess Frazelle 103e2de74a Merge pull request #16533 from justsml/LMDEv2 
LMDE check added to `check_forked()` function - See #16498
Upstream-commit: ea59233eb1fda209d48e11bab10f4cfd2ffe9914
Component: engine
 2015-11-08 02:28:11 -08:00
Vincent Demeester 9d71a73335 Merge pull request #17786 from Microsoft/10662-nativetestunit 
Windows: Native make test-unit
Upstream-commit: e2a9eede2800144651dd2efe335e4bf386b9fd83
Component: engine
 2015-11-08 11:12:09 +01:00
Shuwei Hao f04b3ed326 Modify improper comments in api/server/router/volume/volume.go 
Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com>
Upstream-commit: 6efa10f6687d78f15ee0a3a192b5b41f215c84a9
Component: engine
 2015-11-08 04:05:59 +00:00
Brian Goff 355f3d0514 Merge pull request #17581 from Microsoft/10662-factoroutexecuser 
Windows: Factor out user in execdriver\driver
Upstream-commit: 342e6bb99fd965dad51a79de3886e89f4ca336e4
Component: engine
 2015-11-07 22:11:26 -05:00
Brian Goff edadbf73ae Replace imageMutex with Locker pkg 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2764839ae1ccc55e08d6290ecbf7b58d837bbdd2
Component: engine
 2015-11-07 21:23:12 -05:00
Brian Goff 0d89f7eef8 Merge pull request #17710 from tonistiigi/fix-builder-symlinks 
Fix symlink handling in builder ADD/COPY commands
Upstream-commit: bf5a6d2a83cafd6f56224cdabd8692890472950a
Component: engine
 2015-11-07 16:32:07 -05:00
Antonio Murdaca a386c27379 Merge pull request #17787 from Microsoft/jjh/execdriverutils 
Don't build utils on Windows
Upstream-commit: 98054a8b5cdad069d3b029d6b92788485766a6bd
Component: engine
 2015-11-07 21:27:32 +01:00
Sebastiaan van Stijn 2709e5fddb Merge pull request #16742 from runcom/10772-docker-stats-all 
Allow docker stats without arguments
Upstream-commit: fdc8cce0704c72dc54f95504fe371f5621d89af7
Component: engine
 2015-11-07 19:41:03 +00:00
John Howard 75f7989a9c Don't build utils on Windows 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b10dd17e066614dce1bcaafebf6e902ce9ea169d
Component: engine
 2015-11-07 08:46:36 -08:00
John Howard 975dc00b97 Windows: Native make test-unit 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 7268f767e6d7d1067c896a959654cf493bc5b073
Component: engine
 2015-11-07 08:23:10 -08:00
David Calavera 83dc9caccd Merge pull request #17544 from Microsoft/jjh/nativewindowsbuild 
Windows: Native build without link errors
Upstream-commit: efc7b9bbf7434aef067ad27cb6ba47f8f14ddf5d
Component: engine
 2015-11-07 08:22:35 -08:00
Antonio Murdaca 0bfa6e0ce6 Allow docker stats without arguments 
This patch adds the ability to run `docker stats` w/o arguments and get
statistics for all running containers by default. Also add a new
`--all` flag to list statistics for all containers (like `docker ps`).
New running containers are added to the list as they show up also.
Add integration tests for this new behavior.
Docs updated accordingly. Fix missing stuff in man/commandline
reference for `docker stats`.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: ae818a820f49a9bd7ea8b753f124747fc548e501
Component: engine
 2015-11-07 17:03:33 +01:00
Vincent Batts 8fd542a1df Merge pull request #17757 from rhvgoyal/log-blkid-failure 
devmapper: Provide more error information if blkid fails
Upstream-commit: 10df5647bd5c9e5946412bd58fefb5323f67bc49
Component: engine
 2015-11-07 09:16:14 -05:00
Vincent Demeester 28903f924d Merge pull request #17600 from Microsoft/jjh/fix-test-unit 
Windows: Fix test-unit for local run
Upstream-commit: e71cbc337fd0e2411cab542fde588b91bb960698
Component: engine
 2015-11-07 09:21:16 +01:00
Vincent Demeester 604c93df88 Merge pull request #17616 from Microsoft/10662-fix-dockerfile-parser 
Windows: Fix dockerfile\parser TestTestData unit test
Upstream-commit: 98a1141db96a3b1125471cb14f132b6341db9172
Component: engine
 2015-11-07 09:12:43 +01:00
Brian Goff ee95b28100 Merge pull request #17580 from Microsoft/jjh/move-validation-functions 
Move validation functions in runconfig
Upstream-commit: 62619a118f02e09b76a236ba07c9ac2fede51173
Component: engine
 2015-11-06 22:21:10 -05:00
John Howard 5802185475 Tidy config/hostconfig structures 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ad5052df234e4f48a93e22694f91fda36bb9e95d
Component: engine
 2015-11-06 17:53:46 -08:00
Alexander Morozov 7822116dd5 Merge pull request #17575 from Microsoft/10662-nativetemplate 
Windows: Fix native exec template
Upstream-commit: ad55d29c91fc9ce4851cb0d8456bd5517a5eb0cd
Component: engine
 2015-11-06 16:14:44 -08:00
John Howard 10a453a65f Windows: Native daemon build 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d92f7f42b22e2cfd1ca751824f907357d8143a3d
Component: engine
 2015-11-06 15:35:56 -08:00
John Howard 9a26d83917 Move validation functions 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ee6c3580c95014b404ec9400fdc0575f27e91b80
Component: engine
 2015-11-06 15:28:50 -08:00
John Howard cddc489efe Windows: Fix test-unit for local run 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 33faea576ffbd0e86d1f0f53876620f9e4d9b63f
Component: engine
 2015-11-06 15:23:48 -08:00
David Calavera a401f0d13c Merge pull request #17576 from Microsoft/10662-graphtest 
Windows: Fix daemon\graphdriver\graphtest
Upstream-commit: 1ba280a8db8456649b661e292d687f1be7ed3468
Component: engine
 2015-11-06 15:13:31 -08:00
David Calavera 06af72f791 Merge pull request #17511 from Microsoft/jjh/fix-test-paths 
Fix test file paths
Upstream-commit: 12281035631c6955a6294737ba1bfc9212516651
Component: engine
 2015-11-06 15:09:03 -08:00
David Calavera 52d7bf68f1 Merge pull request #17777 from Microsoft/10662-tp4locahost 
Windows [TP4] localhost mitigation for 2-second perf regression
Upstream-commit: 2fff6b15fe863ecd92f5e8ebd9239c3eb2788442
Component: engine
 2015-11-06 15:06:27 -08:00
David Calavera 7cc6faffed Merge pull request #17738 from Microsoft/jjh/login 
Windows: [TP4] Fix docker login
Upstream-commit: f1983344001df0f598e75cc68367899191421ea9
Component: engine
 2015-11-06 15:02:42 -08:00
David Calavera d3e1496300 Merge pull request #17751 from guilhem/patch-1 
Fix missing `-d` flag in docker.fish
Upstream-commit: 754c2e08b774ab7a468e85ef654d34b2c5d925e6
Component: engine
 2015-11-06 14:59:30 -08:00
Lei Jitang 24f23c55ef Test to verify --mac-address doesn't get applied to new endpoint 
created on network connect.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 451b79d69102ad95f1b91a52bb4b17c240f41e56
Component: engine
 2015-11-06 14:52:35 -08:00
Vincent Demeester 592b2afbd0 Merge pull request #17767 from LK4D4/nice_logs_message 
Return nice client-side message for docker logs
Upstream-commit: 2d87403704f78ceec9c2eed10bbaa82cffb2bd86
Component: engine
 2015-11-06 23:51:05 +01:00
Aditi Rajagopal 51057d5c21 Checkers on docker_cli_by_digest_test 
Applying #16756 to integration-cli/docker_cli_by_digest_test.go

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Upstream-commit: 1c9a5d7be73e4ec861dd88ffd0b1e43769fd363a
Component: engine
 2015-11-06 16:15:35 -06:00
Christopher Jones 012c3d4b3c Fixed broken links in docker_remote_api 
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 93939c3f9fda70930ec2d3af4c6231ccfbc6b8ef
Component: engine
 2015-11-06 16:12:51 -06:00
Santhosh Manohar 4955633439 Allow port mapping only for endpoint created on docker run 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: dedcf6a6ff6d3aa75efaeb31c197b1c3a19305be
Component: engine
 2015-11-06 13:54:17 -08:00
John Howard 55ab290410 Windows [TP4] localhost mitigation 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: eb2acb8f0e58a0007434341e9e011010594b288e
Component: engine
 2015-11-06 13:52:59 -08:00
Vincent Demeester 900059747c Use checker for docker_cli_run_unix_test.go 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7a82429b3d0fc7a93f61406117c170aaf9a4f9be
Component: engine
 2015-11-06 22:49:16 +01:00
moxiegirl 193b8e63c7 Merge pull request #17713 from nathanleclaire/mhs_nits_2_the_sequel_electric_overloo 
Revise commands in Compose section of multi-host quickstart
Upstream-commit: 8aa8d51610f509bbdbbe8409523da575d4907d28
Component: engine
 2015-11-06 13:04:43 -08:00
Tianon Gravi 417ebc9d17 Fix Windows support in .vendor-helpers.sh 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 1c383af6ae9551320719d56c2f059cbe5e5f1a35
Component: engine
 2015-11-06 12:07:24 -08:00
Alexander Morozov 0791fd443d Return nice client-side message for docker logs 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e37e329074517f48db8468affc62beb595ab090e
Component: engine
 2015-11-06 11:40:48 -08:00