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
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
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
eaec8fb727
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 >
Upstream-commit: 2c8b7c597ae43e28887a52a9fcb12273fe7d8797
Component: engine
2015-11-06 08:21:20 -05:00
26ede0774c
Merge pull request #17753 from runcom/fix-typo-tests-reqs
...
integration-cli: requirements: fix typo
Upstream-commit: 6ba7d04d1610472371b4c6a5a572119ffb10f6e9
Component: engine
2015-11-06 07:02:51 -05:00
181fef49a3
Merge pull request #17746 from coolljt0725/remove_lxcconfig
...
Remove LxcConf in daemon_test.go and fix a typo
Upstream-commit: 7dda44004d9943b669f12f3d79456806110d974b
Component: engine
2015-11-06 12:21:33 +01:00
b9c3e2329d
integration-cli: requirements: fix typo
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 313b85fa47c0080feb0d5887903df9b74f0701bf
Component: engine
2015-11-06 12:15:42 +01:00
d04d1fe56b
Fix missing -d flag in docker.fish
...
Signed-off-by: Guilhem Lettron <guilhem@lettron.fr >
Upstream-commit: 4a3cd881721ff7986fcdc3544e67b66a259c2ca6
Component: engine
2015-11-06 11:53:17 +01:00
920a8605ab
Merge pull request #17383 from Microsoft/10662-volumeerrors
...
Fix volume error messages
Upstream-commit: f1834153de196361e14c86b12c98d6b118cd4f56
Component: engine
2015-11-05 21:58:03 -05:00
e11568b0ea
Remove LxcConf in daemon_test.go and fix a typo
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 00d00b429ff6f5cecf6789d6b6773b8e979ad0ae
Component: engine
2015-11-06 09:58:06 +08:00
2c2adafd8e
Merge pull request #17696 from thaJeztah/update-ubuntu-install
...
Docs: add "Linux kernel extra" to manual install
Upstream-commit: 5e2f31e99220536bc0d845bfbfedde59a007a276
Component: engine
2015-11-06 02:04:05 +01:00
c6ff072fba
Merge pull request #17610 from thaJeztah/add-env-example
...
Add examples for ENV vars in API
Upstream-commit: 7a2669f59683c9d286494fa1360c792cc501e98f
Component: engine
2015-11-06 01:19:58 +01:00
d46b75c80b
Merge pull request #17693 from tophj-ibm/fixed-docs-contribution-link
...
Fixed link to contribution page in docs/README.md.
Upstream-commit: a1ecd8e68cb373af2b02d75a222ac9ce07517665
Component: engine
2015-11-06 09:57:07 +10:00
13125ff6b4
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
Upstream-commit: 2519f465501657c24ecd13b8e53964b6c2f1a78d
Component: engine
2015-11-05 15:22:37 -08:00
b31d380f40
Merge pull request #16692 from vdemeester/16690-fix-etc-osrelease-panic
...
Fix panic in parsing /etc/os-release
Upstream-commit: 98ec6bc14c165a06cf510ca5714ce4e831d405e6
Component: engine
2015-11-05 15:11:02 -08:00
90a6db029c
Merge pull request #17735 from LK4D4/errcode_resize
...
Move errcode handling for resize upper
Upstream-commit: b232362310c24a74c01741bb43ec3052ffe49f83
Component: engine
2015-11-05 15:00:48 -08:00
d0707f6b8c
Windows: Fix docker login
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9c765040a5638429384b56a1b77139c6d4049c75
Component: engine
2015-11-05 14:19:48 -08:00
f427a47755
Remove exec-driver global daemon option.
...
Each platform has only a driver now.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 157b66ad390902ef6f5b51b3f76d5177eacac81b
Component: engine
2015-11-05 17:09:58 -05:00
