toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,723 Commits 3 Branches 295 Tags
971f161db1e762145406ed3d93d66c8d0d6a7b5b
Commit Graph
19723 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Lehmann 971f161db1 Cap the amount of buffering done by BytesPipe 
Turn BytesPipe's Read and Write functions into blocking, goroutine-safe
functions. Add a CloseWithError function to propagate an error code to
the Read function.

Adjust tests to work with the blocking Read and Write functions.

Remove BufReader, since now its users can use BytesPipe directly.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 64f8ee444d23ae29a236f169f1d7faf7042b524a
Component: engine
 2015-11-12 10:11:29 -08:00
David Calavera d40820af47 Merge pull request #17838 from calavera/revert_17579 
Revert "Tidy config/hostconfig structures"
Upstream-commit: fa210a01be7927e8332c20da0770de0d855caf51
Component: engine
 2015-11-09 15:21:26 -08:00
Tibor Vass c53c22b70c Merge pull request #17779 from calavera/fix_dns_regression 
Use an empty slice as default value for DNS, DNSSearch and DNSOptions.
Upstream-commit: 62b484411e851542cdc05ef36fb287c2245ec70c
Component: engine
 2015-11-09 18:07:07 -05:00
David Calavera 7523555ae3 Merge pull request #17450 from rhatdan/selinux 
Fix relabel for SELinux
Upstream-commit: 143f3579b0553b50b03438aef76d908a5d327863
Component: engine
 2015-11-09 13:19:28 -08:00
David Calavera 2f262fa249 Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again 
Another try at dockerversion placeholder for library import
Upstream-commit: 58b270c338e831ac6668a29788c72d202f9fc251
Component: engine
 2015-11-09 13:15:50 -08:00
David Calavera 99a2fbf27e Revert "Tidy config/hostconfig structures" 
This reverts commit ad5052df234e4f48a93e22694f91fda36bb9e95d.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3a1200f9f11a016abd75588fa3812fb5505b2c3a
Component: engine
 2015-11-09 15:46:45 -05:00
David Calavera d0affbc9f8 Merge pull request #17819 from tonistiigi/17766-fix-opq-dot 
Fix opq whiteouts problems for files with dot prefix
Upstream-commit: 69bc4ebe7a7d05a07929cb2d63f27b4ccf87c905
Component: engine
 2015-11-09 11:08:31 -08:00
Dan Walsh 21f4b9fc72 Fix relabel for SELinux 
With the changes merged into runc/libcontainer, are now causing
SELinux to attempt a relabel always, even if the user did not
request the relabel.

If the user does not specify Z or z on the volume mount we should
not attempt a relabel.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: d9011b36176d6245bdc25401633c213d73e14ea0
Component: engine
 2015-11-09 14:04:57 -05:00
Vincent Demeester 094e7a47db Merge pull request #17816 from coolljt0725/remove_execdriver_env 
Remove DOCKER_EXECDRIVER env
Upstream-commit: e509fe604c51cffb480098c4377c60bea1261fb1
Component: engine
 2015-11-09 19:59:18 +01:00
David Calavera 3ab3ccd0f9 Merge pull request #17834 from LK4D4/update_runc 
Update runc to introduce RelabelNeeded function
Upstream-commit: 56c8d4aaeff688ca5dc1f8f4c558d2e0110c3638
Component: engine
 2015-11-09 10:58:54 -08:00
Alexander Morozov d3bbdbd31a Merge pull request #17775 from vdemeester/16756-integration-cli-checkers-runs-unix 
Use checker for docker_cli_run_unix_test.go
Upstream-commit: 2786af3add53a4224c5bb7e0cd8e097cad45314f
Component: engine
 2015-11-09 10:44:32 -08:00
Vincent Demeester 48001c30bb dockerversion placeholder for library import 
- Add a *version* file placeholder.
- Update autogen and builds to use it and an autogen build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8054a303870b81eebe05e38261c1b68197b68558
Component: engine
 2015-11-09 19:32:46 +01:00
David Calavera 829d4787d5 Merge pull request #17810 from cpuguy83/graph_cleanup 
Graph: Un-export non-externally used functions
Upstream-commit: 0631ec6ca00da93576c215b939583b597ae8c110
Component: engine
 2015-11-09 10:30:13 -08:00
David Calavera 17291e75fa Merge pull request #17829 from albers/completion-stats--all 
bash completion for `docker stats --all`
Upstream-commit: e1910a8e231f55c92c765c7869bf874a1ca14106
Component: engine
 2015-11-09 10:29:33 -08:00
David Calavera eb1eef5173 Merge pull request #17579 from Microsoft/jjh/tidyconfigstructs 
Tidy config/hostconfig structures
Upstream-commit: 427dcb7f825830bf66402cdb577dcd520499c1b0
Component: engine
 2015-11-09 10:14:58 -08:00
Alexander Morozov 7eead35e44 Update runc to introduce RelabelNeeded function 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 00bcc924fa64b16484beeeabbd2969572d03d30d
Component: engine
 2015-11-09 10:03:25 -08:00
David Calavera 0345dce058 Use an empty slice as default value for DNS, DNSSearch and DNSOptions 
So we don't print those <no value> in the client and we don't fail
executing inspect templates with API field names.

Make sure those fields are initialized as empty slices when
a container is loaded from disk and their values are nil.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f1a74a89f89affcfbe311e89aa752b3d551e0340
Component: engine
 2015-11-09 12:46:48 -05:00
Alexander Morozov 7359274c6d Merge pull request #17584 from Microsoft/10662-OOMKilled 
Windows: Refactor exitStatus structure
Upstream-commit: 7adfb3221efe7b97d00d1baacb74bed0013e6f76
Component: engine
 2015-11-09 09:23:08 -08:00
John Howard 626bc69479 Refactor exitStatus structure 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 77af7d1067b83cf683745e3f15ce19425beb34e0
Component: engine
 2015-11-09 08:26:35 -08:00
Alexander Morozov 4364a664e5 Merge pull request #17089 from Microsoft/10662-ansi 
Windows: Native ANSI console support
Upstream-commit: 28588efb47bc22c409f14ea4a534a01c53c6e1bd
Component: engine
 2015-11-09 08:05:08 -08:00
Harald Albers 77d68ba99d bash completion for docker stats --all 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ee13fc5b2f15ae5b4a8c1a6ee23355e6463e2b48
Component: engine
 2015-11-09 16:27:13 +01:00
Tonis Tiigi 958ff17b48 Fix opq whiteouts problems for files with dot prefix 
Fixes #17766

Previously, opaque directory whiteouts on non-native
graphdrivers depended on the file order, meaning
files added with the same layer before the whiteout
file `.wh..wh..opq` were also removed.

If that file happened to have subdirs, then calling
chtimes on those dirs after unpack would fail the pull.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: db3070ab1b9e394e45b1db22b8ed8352272d4410
Component: engine
 2015-11-08 23:00:01 -08:00
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
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 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
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