Commit Graph

20092 Commits

Author SHA1 Message Date
David Calavera
e1910a8e23 Merge pull request #17829 from albers/completion-stats--all
bash completion for `docker stats --all`
2015-11-09 10:29:33 -08:00
David Calavera
427dcb7f82 Merge pull request #17579 from Microsoft/jjh/tidyconfigstructs
Tidy config/hostconfig structures
2015-11-09 10:14:58 -08:00
Alexander Morozov
00bcc924fa Update runc to introduce RelabelNeeded function
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-09 10:03:25 -08:00
John Howard
5fa2e4d4f2 Refactor ProcessConfig
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-09 09:51:09 -08:00
David Calavera
f1a74a89f8 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>
2015-11-09 12:46:48 -05:00
Alexander Morozov
7adfb3221e Merge pull request #17584 from Microsoft/10662-OOMKilled
Windows: Refactor exitStatus structure
2015-11-09 09:23:08 -08:00
John Howard
77af7d1067 Refactor exitStatus structure
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-09 08:26:35 -08:00
Alexander Morozov
28588efb47 Merge pull request #17089 from Microsoft/10662-ansi
Windows: Native ANSI console support
2015-11-09 08:05:08 -08:00
Harald Albers
ee13fc5b2f bash completion for docker stats --all
Signed-off-by: Harald Albers <github@albersweb.de>
2015-11-09 16:27:13 +01:00
Kai Qiang Wu(Kennan)
a874ce08f3 Fixing wrong volume doc format
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2015-11-09 02:17:50 -06:00
Tonis Tiigi
db3070ab1b 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>
2015-11-08 23:00:01 -08:00
Vincent Demeester
944dc7fa8f Merge pull request #17808 from bboreham/ipc-errormsg
Fix typo in container-start error message
2015-11-09 07:58:03 +01:00
Vincent Demeester
c13ca529d3 Merge pull request #17817 from Microsoft/jjh/contained
Typo s/contained/container
2015-11-09 07:55:44 +01:00
Harald Albers
211e3b0df6 Fix bash completion on systems where extglob is not set
Signed-off-by: Harald Albers <github@albersweb.de>
2015-11-08 22:31:16 -08:00
John Howard
2ff68910e2 Typo s/contained/container
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-08 18:29:34 -08:00
Lei Jitang
a2d8c93fc6 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>
2015-11-09 10:19:53 +08:00
Lei Jitang
3c4dab51d3 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>
2015-11-09 09:17:32 +08:00
Brian Goff
d7a41325fa Un-export non-externally used functions
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-08 15:51:27 -05:00
Bryan Boreham
93405dd037 Fix typo in error message
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2015-11-08 18:05:34 +00:00
Harald Albers
8311db14fc Align configuration of bash completion with existing values
Signed-off-by: Harald Albers <github@albersweb.de>
2015-11-08 09:35:48 -08:00
Doug Davis
e357be4abe Merge pull request #17801 from cpuguy83/remove_dead_graph_code
Remove dead graph code
2015-11-08 12:33:27 -05:00
Antonio Murdaca
343c8547df Merge pull request #17762 from LK4D4/builder_commit
Use name instead of container in Commit
2015-11-08 15:57:13 +01:00
Brian Goff
8c08002a10 Remove dead graph code
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-08 08:57:54 -05:00
Brian Goff
70b3ce17b7 Merge pull request #17793 from haoshuwei/modify-improper-comments-on-volume-file
Modify improper comments in api/server/router/volume/volume.go
2015-11-08 07:24:48 -05:00
Antonio Murdaca
e4d8ea0087 Merge pull request #17792 from cpuguy83/graph_use_locker_pkg
Replace `imageMutex` with `Locker` pkg
2015-11-08 12:11:20 +01:00
Jess Frazelle
ea59233eb1 Merge pull request #16533 from justsml/LMDEv2
LMDE check added to `check_forked()` function - See #16498
2015-11-08 02:28:11 -08:00
Vincent Demeester
e2a9eede28 Merge pull request #17786 from Microsoft/10662-nativetestunit
Windows: Native make test-unit
2015-11-08 11:12:09 +01:00
Shuwei Hao
6efa10f668 Modify improper comments in api/server/router/volume/volume.go
Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com>
2015-11-08 04:05:59 +00:00
Brian Goff
342e6bb99f Merge pull request #17581 from Microsoft/10662-factoroutexecuser
Windows: Factor out user in execdriver\driver
2015-11-07 22:11:26 -05:00
Brian Goff
2764839ae1 Replace imageMutex with Locker pkg
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-07 21:23:12 -05:00
Brian Goff
bf5a6d2a83 Merge pull request #17710 from tonistiigi/fix-builder-symlinks
Fix symlink handling in builder ADD/COPY commands
2015-11-07 16:32:07 -05:00
Antonio Murdaca
98054a8b5c Merge pull request #17787 from Microsoft/jjh/execdriverutils
Don't build utils on Windows
2015-11-07 21:27:32 +01:00
Sebastiaan van Stijn
fdc8cce070 Merge pull request #16742 from runcom/10772-docker-stats-all
Allow docker stats without arguments
2015-11-07 19:41:03 +00:00
John Howard
b10dd17e06 Don't build utils on Windows
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-07 08:46:36 -08:00
John Howard
7268f767e6 Windows: Native make test-unit
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-07 08:23:10 -08:00
David Calavera
efc7b9bbf7 Merge pull request #17544 from Microsoft/jjh/nativewindowsbuild
Windows: Native build without link errors
2015-11-07 08:22:35 -08:00
Antonio Murdaca
ae818a820f 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>
2015-11-07 17:03:33 +01:00
Vincent Batts
10df5647bd Merge pull request #17757 from rhvgoyal/log-blkid-failure
devmapper: Provide more error information if blkid fails
2015-11-07 09:16:14 -05:00
Vincent Demeester
e71cbc337f Merge pull request #17600 from Microsoft/jjh/fix-test-unit
Windows: Fix test-unit for local run
2015-11-07 09:21:16 +01:00
Vincent Demeester
98a1141db9 Merge pull request #17616 from Microsoft/10662-fix-dockerfile-parser
Windows: Fix dockerfile\parser TestTestData unit test
2015-11-07 09:12:43 +01:00
Brian Goff
62619a118f Merge pull request #17580 from Microsoft/jjh/move-validation-functions
Move validation functions in runconfig
2015-11-06 22:21:10 -05:00
John Howard
ad5052df23 Tidy config/hostconfig structures
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-06 17:53:46 -08:00
Alexander Morozov
ad55d29c91 Merge pull request #17575 from Microsoft/10662-nativetemplate
Windows: Fix native exec template
2015-11-06 16:14:44 -08:00
John Howard
d92f7f42b2 Windows: Native daemon build
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-06 15:35:56 -08:00
John Howard
ee6c3580c9 Move validation functions
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-06 15:28:50 -08:00
John Howard
33faea576f Windows: Fix test-unit for local run
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-06 15:23:48 -08:00
David Calavera
1ba280a8db Merge pull request #17576 from Microsoft/10662-graphtest
Windows: Fix daemon\graphdriver\graphtest
2015-11-06 15:13:31 -08:00
David Calavera
1228103563 Merge pull request #17511 from Microsoft/jjh/fix-test-paths
Fix test file paths
2015-11-06 15:09:03 -08:00
David Calavera
2fff6b15fe Merge pull request #17777 from Microsoft/10662-tp4locahost
Windows [TP4] localhost mitigation for 2-second perf regression
2015-11-06 15:06:27 -08:00
David Calavera
f198334400 Merge pull request #17738 from Microsoft/jjh/login
Windows: [TP4] Fix docker login
2015-11-06 15:02:42 -08:00