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

339 commits

Author SHA1 Message Date
Alexander Larsson
5d76681c3d Implement fallback for getting the size of a container 
This moves Driver.Size() to Differ.DiffSize(), removing the empty
implementations in devmapper and dummy, and renaming the one in aufs.

Then we fall back to a container.Changes() implementation in the non-aufs
case.
 2013-11-19 10:36:54 +01:00
Michael Crosby
4908d7f81d Save driver to container and skip incompat containers 
For people who toggle drivers we want to save the driver used
to create a container so that if the driver changes we can skip
loading the container and it should not show up in docker ps
 2013-11-14 22:53:59 -08:00
Guillaume J. Charmes
7cf60da388
Merge branch 'master' into shykes-0.6.5-dm-plugin 
Conflicts:
	utils.go
	utils_test.go
 2013-11-14 14:02:44 -08:00
Michael Crosby
629c6e3649 Merge pull request #2445 from alexlarsson/fix-shared-root-from-dm 
Fix lxc start for shared root filesystems
 2013-11-14 11:20:53 -08:00
Michael Crosby
5d9723002b Allow drivers to implement ApplyDiff in Differ interface 2013-11-11 19:09:57 -08:00
Victor Vieux
bc6d872841 on docker start, do not cleanup if already running 2013-11-11 18:15:38 -08:00
Michael Crosby
2c7f50a77d Add ability to exclude files from tar 2013-11-11 14:30:38 -08:00
Victor Vieux
4c7d24bc8b Merge branch 'master' of https://github.com/zilin/docker into zilin-master 
Conflicts:
	container.go
 2013-11-11 12:59:18 -08:00
Victor Vieux
87c8437a90 Merge pull request #2140 from SvenDowideit/2098-run-cidfile-should-return-longid 
Server: always return long id's
 2013-11-11 13:06:19 -08:00
Victor Vieux
da24945070 Merge branch 'master' of https://github.com/aanand/docker into aanand-master 2013-11-11 12:34:16 -08:00
Michael Crosby
4d1a537433 Remove Differ and Changer interfaces 
Add the methods to the Driver interface
to force the drivers to implement the methods
 2013-11-11 12:10:53 -08:00
Alexander Larsson
e82f8c1661 Implement fallback operation for driver.Diff() 
This moves the Diff() operation to a separate Differ interface and
implements a fallback that uses the Changes() results to encode
a diff tar.
 2013-11-11 17:46:07 +01:00
Sven Dowideit
b3974abe4f make all image ID and container ID API responses use the Long ID (Closes #2098) 2013-11-09 12:16:49 +10:00
Michael Crosby
1f35531f39 Merge pull request #13 from crosbymichael/fix-volume-mount 
Do not pass container information when creating a volume
 2013-11-08 16:35:00 -08:00
Michael Crosby
ddb27268c9 Do not pass container information when creating a volume 2013-11-08 16:11:57 -08:00
Michael Crosby
1eb00e1d5b Allow drivers to export their own diff 2013-11-08 15:32:50 -08:00
Michael Stapelberg
e7fdcc15c5 Return “err” instead of “nil” when MkdirAll() fails when binding a volume 2013-11-08 22:52:10 +01:00
Michael Crosby
20f690f176 Make sure dirs are created before injecting file 2013-11-08 12:06:15 -08:00
Victor Vieux
49d7b87cfc prevent panic if you use API in a wrong way 2013-11-07 18:54:00 -08:00
Solomon Hykes
99210c9c6e Don't rely on drivers for diff and export 2013-11-08 02:48:52 +00:00
Victor Vieux
f417c4b099 Merge branch '1887-allow_ro_volumes-from' of https://github.com/daniel-garcia/docker into daniel-garcia-1887-allow_ro_volumes-from 2013-11-07 17:59:55 -08:00
Solomon Hykes
9ae4bcaaf8 Move Change to the archive package, and fix a leftover merge in 
Container.Inject()
 2013-11-08 00:45:07 +00:00
Solomon Hykes
f1127b9308 gofmt 2013-11-07 23:58:03 +00:00
Solomon Hykes
165d1bdbc0 Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	container.go
	runtime.go
 2013-11-07 23:26:52 +00:00
Solomon Hykes
f2bab1557c Simplify graphdriver interface: Create, Get. No more external mounting or Dir/Image interface 2013-11-07 22:38:50 +00:00
Solomon Hykes
77ae9789d3 Internal cleanup: use the mounted container filesystem instead of manipulating the aufs layers directly 2013-11-07 20:30:56 +00:00
Guillaume J. Charmes
6998c3c387
go fmt 2013-11-07 12:27:33 -08:00
Alexander Larsson
157d99a727 lxc: Work around lxc-start need for private mounts 
lxc-start requires / to be mounted private, otherwise the changes
it does inside the container (both mounts and unmounts) will propagate
out to the host.

We work around this by starting up lxc-start in its own namespace where
we set / to rshared.

Unfortunately go can't really execute any code between clone and exec,
so we can't do this in a nice way. Instead we have a horrible hack that
use the unshare command, the shell and the mount command...
 2013-11-06 20:43:06 +01:00
Mark Allen
74f853a2ae See if a path exists before injecting Reader there 
Closes #1965
 2013-11-05 23:44:52 -06:00
unclejack
4b8c41c4a2 disallow / as source for bind mount in the cli 
This makes the docker cli reject docker run commands which include bind
mounts like "/:/some/path/in/the/container".
Bind mounting the root directory is a bad idea and the cli should throw
an error right away.

The same check will also be made by the remote API via another commit.
 2013-11-05 22:52:54 +02:00
Daniel Garcia
f9cb6ae46a Add ability to mount volumes in readonly mode using -volumes-from 2013-11-05 11:58:51 -06:00
Guillaume J. Charmes
342bd43b76 Merge pull request #2525 from dotcloud/fix_hostnames 
Fix regression in /etc/hosts
 2013-11-04 11:26:27 -08:00
Solomon Hykes
98c3693acf Integrate devmapper and aufs into the common "graphdriver" framework. 
aufs is still enabled by default, no mechanism for switching drivers
yet.
 2013-11-04 17:28:35 +00:00
Paul Nasrat
95708dd35c Create new network on dead ghosts on restart. 
Fixes #2089
 2013-11-03 14:13:18 -05:00
Victor Vieux
f3685333c0 fix regression in /etc/hosts 2013-11-01 15:46:26 -07:00
Victor Vieux
7ddd4fe66a rebase 2013-11-01 14:01:32 -07:00
Jérôme Petazzoni
31638ab2ad Refactor HostConfig and escape apparmor confinement 2013-11-01 13:55:19 -07:00
Michael Crosby
65ba2868d7 Merge pull request #2492 from dotcloud/publish-all-flag 
Add -P flag to publish all exposed ports
 2013-11-01 10:21:02 -07:00
Aanand Prasad
9ee9d2f995 Container memory limit can be specified in kilobytes, megabytes or gigabytes 
-m 10  # 10 bytes
    -m 10b # 10 bytes
    -m 10k # 10240 bytes (10 * 1024)
    -m 10m # 10485760 bytes (10 * 1024 * 1024)
    -m 10g # 10737418240 bytes (10 * 1024 * 1024 * 1024)

Units are case-insensitive, and 'kb', 'mb' and 'gb' are equivalent to 'k', 'm' and 'g'.
 2013-11-01 12:00:17 +00:00
Solomon Hykes
36c7a7ae94 Partial merge of devmapper/ in order to integrate it as a backend 
plugin.

The merge is inert, in other words the devmapper code is not called
and the primary aufs backend is untouched.
 2013-11-01 04:24:17 +00:00
Michael Crosby
699a1074fb Initial work on moving aufs to a subpackage 2013-10-31 18:07:54 -07:00
Michael Crosby
96d1e9bb5a Move archive.go to sub package 2013-10-31 16:57:45 -07:00
Michael Crosby
652f07bb59 Add -P flag to publish all exposed ports 2013-10-31 11:28:30 -07:00
Zilin Du
b543516556 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	container.go
 2013-10-31 10:53:40 -07:00
Brian Olsen
1c3a674444 Fixed problem with variables containing \n. 
The /.dockerenv file is now a marshalled json array so that environment
variables with \n and other weird values are supported.
 2013-10-31 01:19:32 +01:00
Brian Olsen
25c4c87c86 Support copying value from env with -e option. 2013-10-31 01:19:09 +01:00
Brian Olsen
be7eb4bfcb Set environment variables using a file. 2013-10-31 00:48:12 +01:00
Michael Crosby
746ba127bf Hotfix: Migrate public mappings after upgrade 2013-10-30 08:15:12 -07:00
Victor Vieux
e0b59ab52b Enable sig-proxy by default in run and attach 2013-10-29 11:18:34 -07:00
Michael Crosby
0d2924408b Add -name for docker run 
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
 2013-10-28 18:09:08 -07:00