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

15438 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexander Morozov
340fd140e6 Merge pull request #12988 from Mashimiao/remove-unused-container-functions 
cleanup: remove unneeded locks
 2015-05-09 09:42:27 -07:00
Alexander Morozov
c5710c7318 Merge pull request #13093 from tianon/writeflusher 
Move WriteFlusher out of utils into ioutils
 2015-05-09 09:39:17 -07:00
Alexander Morozov
61cb6012e6 Merge pull request #13095 from Microsoft/10662-pkgrexec 
Windows: reexec pkg supported
 2015-05-09 09:38:42 -07:00
Sebastiaan van Stijn
7699cee247 Merge pull request #12180 from Mashimiao/add-cpuperiod-and-cpuquota-support 
add cpu.cfs_period_us  support
 2015-05-08 22:32:09 -04:00
Ma Shimiao
bcc24ec8ad cleanup remove unneeded locks 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-05-09 10:06:53 +08:00
Ma Shimiao
dccb8b5c33 add cpu.cfs_period_us support 
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
 2015-05-09 10:02:46 +08:00
John Howard
64715c4f33 Windows: reexec pkg supported 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-05-08 14:15:53 -07:00
Michael Crosby
3697dddc0d Merge pull request #12978 from Microsoft/10662-containerexeccreate 
Windows: Split ContainerExecCreate
 2015-05-08 11:38:03 -07:00
Tianon Gravi
223d6de728 Move WriteFlusher out of utils into ioutils 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-05-08 12:33:33 -06:00
Alexander Morozov
23abd51ef1 Merge pull request #13071 from tianon/explicit-vendor 
Update "hack/vendor.sh" to be more explicit
 2015-05-08 08:22:17 -07:00
Brian Goff
af9dac9627 Merge pull request #13069 from runcom/dry-run-test 
API tests - Container create with Hostname, Domainname and Network
 2015-05-07 22:07:41 -04:00
Jessie Frazelle
fe3becee34 Merge pull request #12422 from wlan0/logopts 
add log opts flag to pass in logging options
 2015-05-07 18:10:04 -07:00
Michael Crosby
b94107c4d8 Merge pull request #13080 from jfrazelle/fix-tests-where-requires-libcontainerr-security 
fix lxc because it doesnt have the hardened libcontainer stuff
 2015-05-07 18:07:27 -07:00
Jessie Frazelle
128a07b512 Merge pull request #13027 from runcom/fix-typo-reference-remote-api 
Fix typo in the api remote reference for links
 2015-05-07 17:53:21 -07:00
Jessica Frazelle
52118df432 fix lxc because it doesnt have the hardened libcontainer stuff 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-07 17:40:37 -07:00
Jessie Frazelle
47fbe76a7e Merge pull request #13077 from duglin/MoveCommands 
Make list of commands for help less static
 2015-05-07 17:35:54 -07:00
Jessie Frazelle
6b6a26c769 Merge pull request #11516 from coolljt0725/add_show_error_set_some_flag_in_container_netmode 
add support --net=container with --mac-address, --add-host error out
 2015-05-07 17:13:32 -07:00
Jessie Frazelle
de32f5c431 Merge pull request #11802 from hqhq/hq_add_blkio_weight 
add blkio.weight support
 2015-05-07 17:10:39 -07:00
Jessie Frazelle
982402f4e0 Merge pull request #11831 from cellpjs/patch-1 
Remove mkimage-unittest.sh
 2015-05-07 17:07:56 -07:00
Jessie Frazelle
e03ac8d5b9 Merge pull request #12175 from dqminh/fix-allocate-port 
#12148: sort ports mapping before allocating
 2015-05-07 17:04:20 -07:00
Jessie Frazelle
f6fa579d52 Merge pull request #12270 from burnison/11294-shortidfallback 
Only use fallback to short IDs when obvious.
 2015-05-07 17:02:58 -07:00
Jessie Frazelle
d0bc0153c6 Merge pull request #12278 from duglin/12267-Wildcards 
Fix for Daemon crashing when wildcards are used for COPY/ADD
 2015-05-07 17:01:16 -07:00
Jessie Frazelle
d0cbaeb0d2 Merge pull request #12318 from aarondav/best-effort-iptables-lock 
Do our best not to invoke iptables concurrently if --wait is unsupported
 2015-05-07 17:00:26 -07:00
Jessie Frazelle
67c10e762e Merge pull request #12830 from Microsoft/10662-refactorforwindowsexecdriver 
Windows: Fork execdrivers.go for Windows execdriver
 2015-05-07 16:57:59 -07:00
Jessie Frazelle
0ed2013590 Merge pull request #12952 from sunyuan3/trunc 
Verify the no-trunc option for the search operation
 2015-05-07 16:52:46 -07:00
Jessie Frazelle
372977148d Merge pull request #12961 from hqhq/hq_remove_err_out 
a few cleanups for client output
 2015-05-07 16:51:56 -07:00
Jessie Frazelle
6a4c219615 Merge pull request #12970 from tianon/frozen-user-images 
Allow download-frozen-image.sh to work on user images too
 2015-05-07 16:50:49 -07:00
Jessie Frazelle
d34abea15b Merge pull request #12976 from Microsoft/10662-graphfirstchange 
Windows: First fix for graph\graph.go
 2015-05-07 16:50:20 -07:00
Jessie Frazelle
b1572fd0a4 Merge pull request #12986 from psankar/master 
Added information about mailing lists
 2015-05-07 16:49:14 -07:00
Tianon Gravi
b919dee834 Update "hack/vendor.sh" to be more explicit 
Previously, we've taken advantage of the fact that libcontainer's `update-vendor.sh` is the same syntax as Docker's `vendor.sh` with some shell magic.  This changes that to copy libcontainer's dependencies into this file explicitly so that we can scale to more projects with varying methods of vendoring (assuming they don't use import re-writing, which screws up everyone).

We'll need to stay diligent in making sure this list matches what's in libcontainer's `update-vendor.sh` (minus the not-required codegangsta/cli dep), but that's a fair trade-off for being able to scale our dependency model better (and track new discrete dependencies more directly).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-05-07 17:43:11 -06:00
Tianon Gravi
6a1f862e40 Merge pull request #13032 from jfrazelle/nano-nano-nano 
add nanorc to packaged builds
 2015-05-07 17:35:03 -06:00
Jessie Frazelle
b4dc101d74 Merge pull request #13062 from Microsoft/10662-nativedriver 
Fix os.MkdirAll in native driver
 2015-05-07 16:34:31 -07:00
David Calavera
404412282d Merge pull request #12777 from ZJU-SEL/fix_pull_import_errpromt 
Fix error prompt for pull & import handler postImagesCreate.
 2015-05-07 16:27:15 -07:00
Jessie Frazelle
b6448f25f2 Merge pull request #13065 from tianon/fix-build-deb-tilde-expansion 
Fix '~' expansion in build-deb... (properly this time)
 2015-05-07 16:24:33 -07:00
Jessie Frazelle
b4e8942367 Merge pull request #13076 from LK4D4/fix_api_daemon_order 
Fix api servers creation and daemon start order
 2015-05-07 16:23:44 -07:00
Doug Davis
4f00b1020e Make list of commands for help less static 
Before this PR the list of commands that were printed for the help
text was statically put into the flags.Usage() function via main.init(). This
made it impossible to modify later on when we add new commands
via plugins.

This PR moves the list of commands (name & description) into a structure
that is sorted and printed dynamically by the Usage func.  This will allow
the code to add to the list of commands after the init() func is done
but before the help text is printed for the user.

This just moves code around - it should have no UX impact at all.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-07 16:22:06 -07:00
David Calavera
23193efd93 Merge pull request #13073 from jfrazelle/add_1.6.1_commits 
Add 1.6.1 commits
 2015-05-07 16:17:53 -07:00
Jessie Frazelle
237bd23af8 Merge pull request #13059 from burke/no-fsync-on-temp-archive 
Remove fsync in archive.NewTempArchive
 2015-05-07 16:16:52 -07:00
Jessie Frazelle
1efecc4c41 Merge pull request #13041 from hqhq/hq_fix_checkkernel 
update recommended kernel in checkKernel
 2015-05-07 16:15:12 -07:00
Jessica Frazelle
f66d225427 add nanorc to packaged builds 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-07 16:10:07 -07:00
Jessica Frazelle
2c2f6fd272 bump version back to 1.7.0-dev 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-05-07 15:42:36 -07:00
Alexander Morozov
08230703fd Fix api servers creation and daemon start order 
* daemon creation wasn't parallel to request buffering
* it was possible that empty volume will be created in
  /var/run/docker.sock by some container

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-07 15:38:02 -07:00
Jessica Frazelle
5b1edfed9d Bump version to 1.6.1 
Signed-off-by: Jessica Frazelle <jess@docker.com>
(cherry picked from commit 97cd073598)

Conflicts:
	VERSION
 2015-05-07 15:01:32 -07:00
Michael Crosby
f25bbedc85 Allow libcontainer to eval symlink destination 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Add tests for mounting into /proc and /sys

These two locations should be prohibited from mounting volumes into
those destinations.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-05-07 14:43:39 -07:00
Michael Crosby
2f54c1a352 Update libcontainer to 1b471834b45063b61e0aedefbb1 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-05-07 14:43:39 -07:00
Michael Crosby
a7a51306b1 Mask reads from timer_stats and latency_stats 
These files in /proc should not be able to be read as well
as written to.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-05-07 14:42:23 -07:00
Michael Crosby
27ae108b4e Mount RO for timer_stats and latency_stats in proc 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-05-07 14:42:23 -07:00
Michael Crosby
42c8c1b0b8 Mount /proc/fs as readonly 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-05-07 14:42:23 -07:00
Michael Crosby
d87da59c79 Prevent write access to /proc/asound 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Conflicts:
	integration-cli/docker_cli_run_test.go
 2015-05-07 14:42:23 -07:00
Jessie Frazelle
74bfa36753 Merge pull request #12165 from icecrime/optional_userland_proxy 
Optional userland proxy
 2015-05-07 14:01:16 -07:00