00bcc924fa
Update runc to introduce RelabelNeeded function
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-09 10:03:25 -08:00
7adfb3221e
Merge pull request #17584 from Microsoft/10662-OOMKilled
...
Windows: Refactor exitStatus structure
2015-11-09 09:23:08 -08:00
77af7d1067
Refactor exitStatus structure
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-09 08:26:35 -08:00
28588efb47
Merge pull request #17089 from Microsoft/10662-ansi
...
Windows: Native ANSI console support
2015-11-09 08:05:08 -08:00
944dc7fa8f
Merge pull request #17808 from bboreham/ipc-errormsg
...
Fix typo in container-start error message
2015-11-09 07:58:03 +01:00
c13ca529d3
Merge pull request #17817 from Microsoft/jjh/contained
...
Typo s/contained/container
2015-11-09 07:55:44 +01:00
2ff68910e2
Typo s/contained/container
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-08 18:29:34 -08:00
93405dd037
Fix typo in error message
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
2015-11-08 18:05:34 +00:00
e357be4abe
Merge pull request #17801 from cpuguy83/remove_dead_graph_code
...
Remove dead graph code
2015-11-08 12:33:27 -05:00
343c8547df
Merge pull request #17762 from LK4D4/builder_commit
...
Use name instead of container in Commit
2015-11-08 15:57:13 +01:00
8c08002a10
Remove dead graph code
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-08 08:57:54 -05:00
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
e4d8ea0087
Merge pull request #17792 from cpuguy83/graph_use_locker_pkg
...
Replace `imageMutex` with `Locker` pkg
2015-11-08 12:11:20 +01:00
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
e2a9eede28
Merge pull request #17786 from Microsoft/10662-nativetestunit
...
Windows: Native make test-unit
2015-11-08 11:12:09 +01:00
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
342e6bb99f
Merge pull request #17581 from Microsoft/10662-factoroutexecuser
...
Windows: Factor out user in execdriver\driver
2015-11-07 22:11:26 -05:00
2764839ae1
Replace `imageMutex` with `Locker` pkg
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-07 21:23:12 -05:00
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
98054a8b5c
Merge pull request #17787 from Microsoft/jjh/execdriverutils
...
Don't build utils on Windows
2015-11-07 21:27:32 +01:00
fdc8cce070
Merge pull request #16742 from runcom/10772-docker-stats-all
...
Allow docker stats without arguments
2015-11-07 19:41:03 +00:00
b10dd17e06
Don't build utils on Windows
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-07 08:46:36 -08:00
7268f767e6
Windows: Native make test-unit
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-07 08:23:10 -08:00
efc7b9bbf7
Merge pull request #17544 from Microsoft/jjh/nativewindowsbuild
...
Windows: Native build without link errors
2015-11-07 08:22:35 -08:00
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
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
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
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
62619a118f
Merge pull request #17580 from Microsoft/jjh/move-validation-functions
...
Move validation functions in runconfig
2015-11-06 22:21:10 -05:00
ad55d29c91
Merge pull request #17575 from Microsoft/10662-nativetemplate
...
Windows: Fix native exec template
2015-11-06 16:14:44 -08:00
d92f7f42b2
Windows: Native daemon build
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-06 15:35:56 -08:00
ee6c3580c9
Move validation functions
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-06 15:28:50 -08:00
33faea576f
Windows: Fix test-unit for local run
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-06 15:23:48 -08:00
1ba280a8db
Merge pull request #17576 from Microsoft/10662-graphtest
...
Windows: Fix daemon\graphdriver\graphtest
2015-11-06 15:13:31 -08:00
1228103563
Merge pull request #17511 from Microsoft/jjh/fix-test-paths
...
Fix test file paths
2015-11-06 15:09:03 -08:00
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
f198334400
Merge pull request #17738 from Microsoft/jjh/login
...
Windows: [TP4] Fix docker login
2015-11-06 15:02:42 -08:00
754c2e08b7
Merge pull request #17751 from guilhem/patch-1
...
Fix missing `-d` flag in docker.fish
2015-11-06 14:59:30 -08:00
2d87403704
Merge pull request #17767 from LK4D4/nice_logs_message
...
Return nice client-side message for docker logs
2015-11-06 23:51:05 +01:00
eb2acb8f0e
Windows [TP4] localhost mitigation
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-06 13:52:59 -08:00
8aa8d51610
Merge pull request #17713 from nathanleclaire/mhs_nits_2_the_sequel_electric_overloo
...
Revise commands in Compose section of multi-host quickstart
2015-11-06 13:04:43 -08:00
e37e329074
Return nice client-side message for docker logs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-06 11:40:48 -08:00
47da59f7ec
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>
2015-11-06 10:58:12 -08:00
38e34cf6da
Use name instead of container in Commit
...
It will make daemon interface separation easier later.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-06 10:22:00 -08:00
cc207aa136
Merge pull request #17185 from cpuguy83/use_finer_locking_for_volume_store
...
Fix potential races in the volume store
2015-11-06 08:48:12 -08:00
2c8b7c597a
devmapper: Provide more error information if blkid fails
...
Right now if blkid fails we are just logging a debug message and don;t return
the actual error to caller. Caller gets the error message that thin pool
base device UUID verification failed and it might give impression that thin
pool changed. But that's not the case. Thin pool is in such a state that we
could not even query the thin device UUID. Retrun error message appropriately
to make situation more clear.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-11-06 08:21:20 -05:00
6ba7d04d16
Merge pull request #17753 from runcom/fix-typo-tests-reqs
...
integration-cli: requirements: fix typo
2015-11-06 07:02:51 -05:00
7dda44004d
Merge pull request #17746 from coolljt0725/remove_lxcconfig
...
Remove LxcConf in daemon_test.go and fix a typo
2015-11-06 12:21:33 +01:00
313b85fa47
integration-cli: requirements: fix typo
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-06 12:15:42 +01:00
4a3cd88172
Fix missing `-d` flag in docker.fish
...
Signed-off-by: Guilhem Lettron <guilhem@lettron.fr>
2015-11-06 11:53:17 +01:00
Alexander Morozov