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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
8bd20475ee
Fix symlink handling in builder ADD/COPY commands
...
Fixes #17290
Fixes following issues:
- Cache checksums turning off while walking a broken symlink.
- Cache checksums were taken from symlinks while targets were actually copied.
- Copying a symlink pointing to a file to a directory used the basename of the target as a destination basename, instead of basename of the symlink.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 47da59f7ec4ee0f49d47a9b32abb137bb30b2c48
Component: engine
2015-11-06 10:58:12 -08:00
cd606dc8e8
Use name instead of container in Commit
...
It will make daemon interface separation easier later.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 38e34cf6da505ad38f0c4cc2b830becdcf67c58a
Component: engine
2015-11-06 10:22:00 -08:00
aaf8bba9c2
Merge pull request #17185 from cpuguy83/use_finer_locking_for_volume_store
...
Fix potential races in the volume store
Upstream-commit: cc207aa136fd5e01164d245de94fb900ca7212a2
Component: engine
2015-11-06 08:48:12 -08:00
