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

109 commits

Author SHA1 Message Date
Guillaume J. Charmes
e9ee860c91
Merge branch 'master' into dm 
Conflicts:
	Dockerfile
	buildfile.go
	container.go
	hack/make/test
	runtime_test.go
	utils/utils.go
 2013-10-18 12:38:29 -07:00
Solomon Hykes
4bd6021806 devmapper: Rename DeviceSetDM to DeviceSet 2013-10-18 00:07:56 +00:00
Solomon Hykes
153248b60f devicemapper: remove unused code 2013-10-16 23:23:35 +00:00
Michael Crosby
4196c704f0 Merge pull request #1943 from dotcloud/1940-prevent_crash_parseNat_build-fix 
Abort build if mergeConfig returns an error and fix duplicate error message
 2013-10-15 17:40:48 -07:00
Solomon Hykes
fdba1aeed8 Merge branch 'dm-refactor-init' into dm 
Conflicts:
	runtime_test.go
 2013-10-15 23:27:28 +00:00
Michael Crosby
80bd64245f Add filesystemtype for containers 
If no type is specified then assume aufs.
 2013-10-15 11:49:13 -07:00
Solomon Hykes
7093411a8d Initialize devicemapper in NewRuntimeFromDIrectory 2013-10-15 03:53:48 +00:00
Solomon Hykes
20e3e8c07d Merge pull request #2200 from alexlarsson/dm-remove-unused 
Runtime: Remove unused funtion hasFilesystemSupport()
 2013-10-14 13:24:53 -07:00
Alexander Larsson
bb42801cdc Runtime: Remove unused funtion hasFilesystemSupport() 
This used to be used to be used to detect AUFS support, but is not
used anymore.
 2013-10-14 10:54:50 +02:00
Michael Crosby
562e4f1e23 Verbose migration add warning for running container 
Conflicts:
	hack/make.sh
	runtime.go
	runtime_test.go
 2013-10-11 17:11:18 -07:00
Michael Crosby
a263e07678 Migrate AUFS containers to devmapper 
Conflicts:
	hack/make.sh
	runtime.go
 2013-10-11 16:54:08 -07:00
Karl Grzeszczak
ad723bbfe7 Initial steps to fix Issue #936 
Use utils.Errorf instead of utils.Debugf
 2013-10-11 08:04:40 -05:00
Solomon Hykes
1804fcba93 Merged master into device-mapper branch 2013-10-10 12:50:30 -07:00
Victor Vieux
152302e379 go fmt and aufs support removed 2013-09-30 17:35:02 -06:00
Victor Vieux
72a08a5458 Revert "add a -mount-method flag" 
This reverts commit e52d756f40c9ccf8b37ca496cb72be057c909ed7.
 2013-09-30 17:35:02 -06:00
Victor Vieux
aeb89ffbba add a -mount-method flag 2013-09-30 17:35:02 -06:00
Alexander Larsson
91c69fd353 Remove accidental commit that enabled MountMethodFilesystem 2013-09-30 17:35:01 -06:00
Alexander Larsson
43a7d3d0e9 Add trivial copy-based CoW backend 
This creates a container by copying the corresponding files
from the layers into the containers. This is not gonna be very useful
on a developer setup, as there is no copy-on-write or general diskspace
sharing. It also makes container instantiation slower.

However, it may be useful in deployment where we don't always have a lot
of containers running (long-running daemons) and where we don't
do a lot of docker commits.
 2013-09-30 17:35:01 -06:00
Alexander Larsson
5f8e24f842 Runtime: Only remove device on destroy if it exists 2013-09-30 17:35:01 -06:00
Alexander Larsson
76a2ab6e34 Allow specifying the docker client path in _DOCKER_INIT_PATH 
I currently need this to get the tests running, otherwise it will
mount the docker.test binary inside the containers, which doesn't
work due to the libdevmapper.so dependency.
 2013-09-30 17:35:00 -06:00
Alexander Larsson
6094257b28 Limit the amount of prints during normal runs 
This removes some Debugf() calls and chages some direct prints to
Debugf(). This means we don't get a bunch of spew when running the
tests.
 2013-09-30 17:35:00 -06:00
Alexander Larsson
99393cf3cf Delete corresponding Devices when deleting Images 
If an image is deleted and there is a corresponding device
for that image we also delete the image.
 2013-09-30 17:35:00 -06:00
Alexander Larsson
30890c7763 Runtime: Delete corresponding devices when deleting container 2013-09-30 17:35:00 -06:00
Alexander Larsson
8f7361279c Runtime: Add MountMethod to allow AUFS and device-mapper to coexist 2013-09-30 17:34:59 -06:00
Alexander Larsson
ca2f7f955e Runtime: Add DeviceSet singleton 
This adds a DeviceSet singleton to the Runtime object which will be used for
any DeviceMapper dependent code.
 2013-09-30 17:34:59 -06:00
Alexander Larsson
167601e858 Runtime: Automatically use docker-init if it exists 
In some builds the main docker binary is not statically linked,
and as such not usable in as the .dockerinit binary, for those
cases we look for a separately shipped docker-init binary and
use that instead.
 2013-09-30 17:34:58 -06:00
unclejack
22e7e107ad automatically remove container via -rm 
add AutoRemove to HostConfig
add -rm flag to docker run
add TestRunAutoRemove to test -rm
docs: add -rm to commandline/command/run
add hostConfig to container monitor
make monitor destroy the container via -rm

This adds support for automatically removing a container after it
exits. The removal of the container is handled on the server side.
 2013-09-27 17:43:12 +03:00
Victor Vieux
5bd0437eed abord build if mergeConfig returns an error and fix duplicate error message 2013-09-20 12:46:24 +00:00
Victor Vieux
bd847f66c6 rebase master 2013-09-09 22:11:53 +00:00
Solomon Hykes
eca861a99d Add missing package import 2013-09-07 17:03:40 -07:00
Solomon Hykes
6a9f4ecf9b Add missing comments to runtime.go 2013-09-06 17:43:34 -07:00
Solomon Hykes
24e02043a2 Merge builder.go into runtime.go 2013-09-06 17:33:05 -07:00
Victor Vieux
f159f4710b remove message during tests 2013-08-29 22:59:34 +00:00
Guillaume J. Charmes
8dd3607bd1 Merge pull request #1563 from dotcloud/1073_add_loading_message 
* Runtime: Add loading containers message in no debug
 2013-08-23 11:20:22 -07:00
Victor Vieux
b21f898620 assume ip_forwarding = 1 by default 2013-08-19 12:34:30 +00:00
Victor Vieux
20b1e19641 add loading message 2013-08-16 13:43:09 +00:00
Vincent Bernat
64b817a5c1 runtime: correctly detect IPv4 forwarding 
When memory cgroup is absent, there was not attempt to detect if IPv4
forwarding was enabled and therefore, docker was printing a warning
for each command spawning a new container. The test for IPv4
forwarding was guarded by the test for memory cgroup.
 2013-08-11 11:52:16 +02:00
Colin Rice
10190be5d7 Add warning when net.ipv4.ip_forwarding = 0 
Added warnings to api.go, container.go, commands.go, and runtime.go
Also updated APIInfo to return whether IPv4Forwarding is enabled
 2013-08-07 18:28:39 -04:00
Victor Vieux
5756ba9bc4 Merge branch 'master' into new_logs 2013-07-15 13:57:54 +00:00
Victor Vieux
941e3e2ef0 wip 2013-07-11 17:18:28 +00:00
Victor Vieux
bf7d6cbb4a rebase master 2013-07-08 13:26:29 +00:00
Caleb Spare
1cf9c80e97 Mutex style change. 
For structs protected by a single mutex, embed the mutex for more
concise usage.

Also use a sync.Mutex directly, rather than a pointer, to avoid the
need for initialization (because a Mutex's zero-value is valid and
ready to be used).
 2013-07-02 15:53:08 -07:00
Victor Vieux
3042f11666 never remove the file and try to load it in start 2013-07-02 18:02:16 +00:00
Victor Vieux
06b53e3fc7 store hostConfig to /tmp while container is running 2013-07-02 12:19:25 +00:00
Gabriel Monroy
4fdf11b2e6 + Runtime: mount volumes from a host directory with 'docker run -b' 2013-06-26 15:07:31 -07:00
Eric Myhre
e44f62a95c Add argument to allow setting base directory for docker daemon's storage to values other than "/var/lib/docker". 2013-06-20 16:29:54 -05:00
Guillaume J. Charmes
84d68007cb Add -dns to docker daemon 2013-06-05 14:20:54 -07:00
Victor Vieux
fd224ee590 linted names 2013-06-04 18:00:22 +00:00
Victor Vieux
86ada2fa5d drop/omit 2013-06-04 13:51:12 +00:00
Guillaume J. Charmes
f3bab52df4 Move getKernelVersion to utils package 2013-05-15 17:40:47 -07:00