kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity
5144 commits 10 branches 356 tags 299 MiB
Commit graph

363 commits

Author SHA1 Message Date
Victor Vieux
f9328ad9cc Merge pull request from jpoimboe/libvirt-prereq-network 
Set hostname and IP address from dockerinit
 2013-12-13 10:38:17 -08:00
Josh Poimboeuf
e877294321 dockerinit: propagate "container" env variable from lxc 
Lxc (and libvirt) already set the "container" env variable
appropriately[1], so just use that.

[1] http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface/
 2013-12-12 20:08:58 -06:00
Josh Poimboeuf
ecc51cd465 dockerinit: set IP address 
Set the IP address in dockerinit instead of lxc utils, to prepare for
using libvirt-lxc.
 2013-12-12 19:57:11 -06:00
Josh Poimboeuf
b8f1c73705 dockerinit: drop capabilities 
Drop capabilities in dockerinit instead of with lxc utils, since
libvirt-lxc doesn't support it.

This will also be needed for machine container mode, since dockerinit
needs CAP_SYS_ADMIN to setup /dev/console correctly.
 2013-12-12 13:47:24 -06:00
Guillaume J. Charmes
8fd9633a6b
Improve FollowLink to handle recursive link and be more strick 2013-12-11 17:19:02 -08:00
Michael Crosby
f396c42cad Fix volumes on the host by following symlinks in a scope 2013-12-11 16:31:02 -08:00
Daniel Garcia
761184df52 don't open bind mounted files/dirs to get Stat, use os.Lstat 2013-12-10 12:49:53 -06:00
Paul Nasrat
40fe9f581b Extract volume bind, creation and external methods. 
Make Start() slightly more readable.
 2013-12-03 18:58:31 -05:00
Paul Nasrat
84f78d9cad Extract helper method for volume linking. 
Makes this more readable.
 2013-12-03 17:35:54 -05:00
Guillaume J. Charmes
d6cdbca6c1 Merge pull request from daniel-garcia/2671-bindmount_files 
fixes , add support for bind mounting individual files in to contai...
 2013-12-02 09:30:08 -08:00
Guillaume J. Charmes
fbebe20bc6
Add a GetPtyMaster() method to container to retrieve the pty from an other package. 
We could also have put ptyMaster public, but then we need to ignore it in json
otherwise the Marshalling fails. I think it is cleaner that way.
 2013-11-29 07:40:44 -08:00
daniel-garcia
0198f8a879 fixes , add support for bind mounting individual files in to containers, rebases of 2013-11-21 23:40:35 -06:00
Michael Crosby
0cecc2a78c Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	container.go
	image.go
 2013-11-21 17:18:41 -08:00
Michael Crosby
25e443a3c7 Merge pull request from dotcloud/fix_state_race 
Refactor State to be 100% thread safe
 2013-11-21 16:39:50 -08:00
Guillaume J. Charmes
33e70864a2
Refactor State to be 100% thread safe 2013-11-21 16:34:58 -08:00
Michael Crosby
f7c2a00557 Merge pull request from unclejack/fix_layer_size_computation 
Fix layer size computation: handle hard links correctly
 2013-11-21 16:10:24 -08:00
Guillaume J. Charmes
bcdeb37bb6 Merge pull request from dotcloud/fix_status_code_and_usage 
fix status code and usage
 2013-11-21 13:48:38 -08:00
Michael Crosby
cb70eedfda Revert "Lock state before we modify." 
This reverts commit d7e2fc8982.
 2013-11-21 12:11:25 -08:00
Victor Vieux
75a7f4d90c Return status exit status 2 on usage, move parserun into commands.go, display usage on stderr 2013-11-21 11:43:07 -08:00
Paul Nasrat
d7e2fc8982 Lock state before we modify. 
When we start a container we lock state, we should do the same in stop.

Detected via -race.
 2013-11-21 08:06:02 -05:00
Michael Crosby
8fdbf46afb Fix image size calc on initial save 2013-11-20 14:51:04 -08:00
Victor Vieux
cd022376b8 Merge branch 'master' into vieux_merge_master 
Conflicts:
	runtime.go
 2013-11-19 17:32:08 -08:00
unclejack
78c843c8ef fix container size computation: handle hard links 
This change makes docker compute container size correctly.

The old code isn't taking hard links into account. Containers could
seem like they're up to 1-1.5x larger than they really were.
 2013-11-19 13:53:34 +02:00
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
Josh Poimboeuf
fc2f5758cf fix container restart race condition 
Finish container cleanup before setting the state to stopped.
Otherwise, for an application that exits quickly, a call to Restart
can allow Start to be called again before cleanup is done, resulting in
overritten data in the Container struct.
 2013-11-18 11:42:30 -06: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 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 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 ) 2013-11-09 12:16:49 +10:00
Michael Crosby
1f35531f39 Merge pull request 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