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

172 commits

Author SHA1 Message Date
Sven Dowideit
0a3eedd4c9 when sharing a /var/lib/docker dir with more than one distribution, an existing lxc-start-unconfined softlink may point to a non-existant path, following that link (as Stat does) will cause the daemon to fail to start 2013-12-14 15:29:08 +10:00
Guillaume J. Charmes
a6928e70ac Merge pull request #3197 from ajhager/3138-names 
Validate container names on creation. Fixes #3138
 2013-12-13 17:28:36 -08:00
Guillaume J. Charmes
f5ab2516d8 Merge pull request #2897 from crosbymichael/aufs-42 
Increase max image depth to 127
 2013-12-13 16:03:57 -08:00
Joseph Hager
f63cdf0260 Validate container names on creation. Fixes #3138 
Move valid container name regex to the top of the file

Added hyphen as a valid rune in container names.

Remove group in valid container name regex.
 2013-12-13 14:14:05 -05:00
Michael Crosby
7bf3a07371 If container does not exist try to remove the name and continue 2013-12-05 15:22:21 -08:00
Michael Crosby
5976c26c1e Ensure that the init layer is removed with the container 2013-12-03 09:44:48 -08:00
Sven Dowideit
1cb7b9adc6 there appears to be a slash prepended to a container name internally - don't tell the user about it in an error message, it might cause them to worry about it 2013-11-27 12:58:54 +10:00
Michael Crosby
6d34c50e89 Increase max image depth to 127 2013-11-26 17:04:55 -08:00
Marek Goldmann
9c15322894 Fix the 'but is not' typo. 2013-11-26 11:18:50 +01:00
Victor Vieux
110c4f2043 create a copy of dockerinit 2013-11-25 20:21:54 -08:00
Guillaume J. Charmes
19df6c32c0
Merge branch 'master' into use_utc_time 
Conflicts:
	image.go
 2013-11-25 19:01:13 -08:00
Michael Crosby
cee0a292d0 Rename dummy driver to vfs 2013-11-25 09:04:04 -08: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
Guillaume J. Charmes
806abe90ba Use UTC for time 2013-11-21 16:43:36 -08:00
Guillaume J. Charmes
33e70864a2
Refactor State to be 100% thread safe 2013-11-21 16:34:58 -08:00
Michael Crosby
1b28cdc7f9 Handle image metadata when drivers are switched 2013-11-20 10:31:51 -08:00
Victor Vieux
cd022376b8 Merge branch 'master' into vieux_merge_master 
Conflicts:
	runtime.go
 2013-11-19 17:32:08 -08:00
Michael Crosby
234f5ac39f Merge pull request #2750 from jpoimboe/simplify-register-reconnect 
Simplify the runtime Register reconnect logic
 2013-11-19 17:30:59 -08:00
Michael Crosby
d4ef551d65 Merge pull request #53 from shykes/improve_cleanup 
Improve aufs cleanup and debugging
 2013-11-19 17:16:36 -08:00
Victor Vieux
76f54f3a28 Merge pull request #39 from crosbymichael/add-driver-flag 
Add flag to set default graph driver
 2013-11-19 17:16:25 -08:00
Victor Vieux
43899a77bf improve aufs cleanup and debugging 2013-11-19 17:12:37 -08:00
Guillaume J. Charmes
f6629bbbd5 Merge pull request #50 from crosbymichael/limit-dm 
Prohibit more than 42 layers in the core
 2013-11-19 15:42:00 -08:00
Guillaume J. Charmes
28d4cbbc59
Merge branch 'master' into creack-merge-master 
Conflicts:
	api_params.go
	graph.go
	graph_test.go
	image.go
	integration/api_test.go
	integration/container_test.go
	integration/runtime_test.go
	runtime.go
 2013-11-19 14:58:12 -08:00
Josh Poimboeuf
3cbec95177 simplify the runtime Register reconnect logic 
Refactor the Register code a little bit to make it easier to comprehend.
 2013-11-19 14:09:30 -06:00
Michael Crosby
51a972f38d Rename AufsDriver to Driver to be consistent 2013-11-19 03:27:59 -08:00
Michael Crosby
6dbeed89c0 Add flag to set default graph driver 
Remove the env var DOCKER_DRIVER
 2013-11-19 02:37:44 -08:00
Michael Crosby
af753cbad8 Prohibit more than 42 layers in the core 
We need to do this because we still support aufs
and users on other drivers can push incompat images
to the registory that aufs users cannot use.
 2013-11-19 00:51:16 -08:00
Michael Crosby
29f07f8544 Add container migration to aufs driver 2013-11-18 18:39:21 -08:00
Guillaume J. Charmes
5e941f1ca0
Lintify code with confidence=1 2013-11-18 16:24:11 -08:00
Darren Coxall
3c67a28493 More informative error message on name collisions 
This is the proposed fix for #2506. It provides a more complete message
with regards to name collisions including informing of the opposing
containers ID.

I have included a test to ensure that the correct short id is displayed
to make the message easier to understand.
 2013-11-18 17:51:47 +00:00
Guillaume J. Charmes
a518b84751
WIP 2013-11-15 17:16:30 -08:00
Guillaume J. Charmes
cbd1281ec9
rename gograph in graphdb 2013-11-15 15:55:45 -08:00
Guillaume J. Charmes
035c144242
Move all drivers to the same subdir graphdriver 2013-11-15 15:48:24 -08: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
2b23da1d2f Merge pull request #34 from alexlarsson/dm-plugin-dummy-volumes 
Use dummy driver for volumes
 2013-11-15 09:41:16 -08:00
Guillaume J. Charmes
bcf96d95bc Merge pull request #30 from alexlarsson/dm-plugins-archive-tests 
Dm plugins archive tests
 2013-11-15 09:38:17 -08:00
Alexander Larsson
10f23a94f6 Use dummy driver for volumes 
It makes no sense to use the aufs or devicemapper drivers for volumes.
The aufs one is perhaps not a big problem, but the devicemapper one
certainly is. It will be unnecessarily using a dm
blockdevice-over-loopback with a limited size base FS.

This just hardcodes the driver to be the dummy, perhaps in the future
we can have other drivers that make sense for the volumes.
 2013-11-15 11:30:28 +01:00
Alexander Larsson
d69a6a20f0 Use ExportChanges() in runtime.Diff() 
This code was duplicated in two places, one which was unused. This
syncs the code and removes the unused version.
 2013-11-15 09:49:42 +01: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
Solomon Hykes
2a209afe5f gofmt 2013-11-14 10:50:43 -08:00
Solomon Hykes
359a6f49b9 Move integration tests to integration/, expose missing public methods in the core 2013-11-14 10:50:00 -08:00
Michael Crosby
5d9723002b Allow drivers to implement ApplyDiff in Differ interface 2013-11-11 19:09:57 -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
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
9514767587 Allow driver to provide changes if it impl the Changer interface 2013-11-08 14:54:20 -08:00
Josh Poimboeuf
2448058ee2 setup network when reconnecting to ghost container 
Re-adding the line to setup the network when reconnecting to a ghost
container.  It was inadvertently removed by commit
31638ab2ad.
 2013-11-08 16:28:41 -06:00
Solomon Hykes
99210c9c6e Don't rely on drivers for diff and export 2013-11-08 02:48:52 +00:00