0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19689 commits 14 branches 412 tags 338 MiB
Commit graph

19689 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hans Kristian Flaatten
641c739fc1 Utillize build cache for Node.js web app example 
Signed-off-by: Hans Kristian Flaatten <hans@starefossen.com>
 2015-11-10 23:05:32 +01: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
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
David Calavera
754c2e08b7 Merge pull request #17751 from guilhem/patch-1 
Fix missing `-d` flag in docker.fish
 2015-11-06 14:59:30 -08:00
Vincent Demeester
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
John Howard
eb2acb8f0e Windows [TP4] localhost mitigation 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-06 13:52:59 -08:00
moxiegirl
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
Alexander Morozov
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
Tonis Tiigi
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
Alexander Morozov
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
Vivek Goyal
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
Doug Davis
6ba7d04d16 Merge pull request #17753 from runcom/fix-typo-tests-reqs 
integration-cli: requirements: fix typo
 2015-11-06 07:02:51 -05:00
Antonio Murdaca
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
Antonio Murdaca
313b85fa47 integration-cli: requirements: fix typo 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-06 12:15:42 +01:00
Guilhem Lettron
4a3cd88172 Fix missing -d flag in docker.fish 
Signed-off-by: Guilhem Lettron <guilhem@lettron.fr>
 2015-11-06 11:53:17 +01:00
Brian Goff
f1834153de Merge pull request #17383 from Microsoft/10662-volumeerrors 
Fix volume error messages
 2015-11-05 21:58:03 -05:00
Lei Jitang
00d00b429f Remove LxcConf in daemon_test.go and fix a typo 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-11-06 09:58:06 +08:00
Sebastiaan van Stijn
5e2f31e992 Merge pull request #17696 from thaJeztah/update-ubuntu-install 
Docs: add "Linux kernel extra" to manual install
 2015-11-06 02:04:05 +01:00
Sebastiaan van Stijn
7a2669f596 Merge pull request #17610 from thaJeztah/add-env-example 
Add examples for ENV vars in API
 2015-11-06 01:19:58 +01:00
Sven Dowideit
a1ecd8e68c Merge pull request #17693 from tophj-ibm/fixed-docs-contribution-link 
Fixed link to contribution page in docs/README.md.
 2015-11-06 09:57:07 +10:00
Solomon Hykes
2519f46550 Merge pull request #17700 from calavera/remove_lxc 
Remove LXC support.
 2015-11-05 15:22:37 -08:00
David Calavera
98ec6bc14c Merge pull request #16692 from vdemeester/16690-fix-etc-osrelease-panic 
Fix panic in parsing /etc/os-release
 2015-11-05 15:11:02 -08:00
David Calavera
b232362310 Merge pull request #17735 from LK4D4/errcode_resize 
Move errcode handling for resize upper
 2015-11-05 15:00:48 -08:00
John Howard
9c765040a5 Windows: Fix docker login 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-11-05 14:19:48 -08:00
David Calavera
157b66ad39 Remove exec-driver global daemon option. 
Each platform has only a driver now.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-11-05 17:09:58 -05:00
David Calavera
3b5fac462d Remove LXC support. 
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-11-05 17:09:57 -05:00