2514b9eb9b
Merge pull request #3420 from RoelVanNyen/getfullname
...
Cleanup: runtime.getFullName is deprecated by getFullName
Upstream-commit: a0298c0bd070400b4acaad3c2d285037b5875552
Component: engine
2014-01-06 13:59:04 -08:00
0ccbdf155d
Extract cgroups utilities to own submodule.
...
Use mountinfo rather than for cgroups parsing.
Make helper method private and change name.
Makes method naming more explicit rather than GetThisCgroup.
Use upstream term subsystem rather than cgroupType.
Upstream-commit: c561212b837735213f146c2fac291f84dbcbc8c3
Component: engine
2014-01-02 17:54:57 -05:00
bde96d77e1
Cleanup: runtime.getFullName is deprecated by getFullName
...
Upstream-commit: 9dd7ae4074ecfceb62c3c3eae1811c5bd018c38c
Component: engine
2014-01-02 00:06:50 +01:00
10227320c8
Move utility package 'graphdb' to pkg/graphdb
...
Upstream-commit: d16d748132330ff58e142472a579d1f6c65e3eac
Component: engine
2013-12-23 23:33:06 +00:00
cf1704f27a
Merge pull request #3064 from tianon/custom-dockerinit-path
...
Allow custom dockerinit path
Upstream-commit: 636dfc82b0c9aaddd5b0f5fb0f70797d5068c93e
Component: engine
2013-12-19 14:31:41 -08:00
dbe3d58b07
Merge pull request #3271 from crosbymichael/mount-outside
...
Perform docker specific mounts outside of lxc
Upstream-commit: f21bd80e90af12745c7a8bf98d84ec50c3295987
Component: engine
2013-12-19 11:13:31 -08:00
69bf3879ed
Move sqlite conn to graph db for cross compile support
...
Upstream-commit: 329d154209f8da83226e729222dafff4e214b25d
Component: engine
2013-12-18 21:14:16 -08:00
dd4dc32856
Improve interface by moving to subpkg
...
Enable builds on OSX
Upstream-commit: 7bc96aec7bf978e87cb87935bd55f85e2cb1664a
Component: engine
2013-12-18 16:42:49 -08:00
8eec37c741
Handle external mounts outside of lxc
...
Upstream-commit: 45d7dcfea276841cce782feced3a2eb3eab01208
Component: engine
2013-12-18 13:46:02 -08:00
766980f441
add some debug to runtime.restore()
...
Upstream-commit: fde909ffb8e09ae39310093b7389f61aa4ec29df
Component: engine
2013-12-18 10:57:21 -08:00
b6d7266c64
DRY up valid container name pattern usage
...
Upstream-commit: 3ec39ad01a5823acbb3c4ce49ce5c81258a60815
Component: engine
2013-12-17 20:17:50 -05:00
3c037baf07
Add '.' to valid container name pattern
...
Upstream-commit: 1940015824f5dabf1e8ffbd0c2b7c09f11f8cdf0
Component: engine
2013-12-17 20:17:06 -05:00
af74b97c6a
Always copy dockerinit locally, regardless of whether our docker binary is static, because even it might get deleted or moved/renamed
...
Upstream-commit: 2035af44aae3664b217d6903cbf39c259f568490
Component: engine
2013-12-16 22:29:00 -07:00
77b832e35d
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
...
Upstream-commit: 0a3eedd4c9d2bed208a85cd7aefae050a821eb6b
Component: engine
2013-12-14 15:29:08 +10:00
7d30838e63
Merge pull request #3197 from ajhager/3138-names
...
Validate container names on creation. Fixes #3138
Upstream-commit: a6928e70ace51793c15160e5f7206855abab89ff
Component: engine
2013-12-13 17:28:36 -08:00
db82e5f1c7
Merge pull request #2897 from crosbymichael/aufs-42
...
Increase max image depth to 127
Upstream-commit: f5ab2516d8d50c2ef756fe92d7218bc3248d714a
Component: engine
2013-12-13 16:03:57 -08:00
acf919be05
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.
Upstream-commit: f63cdf0260cf6287d28a589a79d3f947def6a569
Component: engine
2013-12-13 14:14:05 -05:00
738aed6186
If container does not exist try to remove the name and continue
...
Upstream-commit: 7bf3a07371bb0baed21b59d60835ed2f4877b571
Component: engine
2013-12-05 15:22:21 -08:00
7e8e4fe649
Ensure that the init layer is removed with the container
...
Upstream-commit: 5976c26c1e7bc7b29489250b8100412ea3d27b60
Component: engine
2013-12-03 09:44:48 -08:00
f43b960fe1
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
...
Upstream-commit: 1cb7b9adc6b9a4e4c8f746c6886a7229b0efda91
Component: engine
2013-11-27 12:58:54 +10:00
aaebc7758b
Increase max image depth to 127
...
Upstream-commit: 6d34c50e898507e461300ecf91ed661011bc15ab
Component: engine
2013-11-26 17:04:55 -08:00
f587c327f7
Fix the 'but is not' typo.
...
Upstream-commit: 9c15322894152095539e41623ef33ec0ebdc6c3f
Component: engine
2013-11-26 11:18:50 +01:00
db32c4ebfa
create a copy of dockerinit
...
Upstream-commit: 110c4f20434af89d81580670f2cec25b1e82633a
Component: engine
2013-11-25 20:21:54 -08:00
020e2aed63
Merge branch 'master' into use_utc_time
...
Conflicts:
image.go
Upstream-commit: 19df6c32c03a649795415bcdf2fd062715557be1
Component: engine
2013-11-25 19:01:13 -08:00
a54274e072
Rename dummy driver to vfs
...
Upstream-commit: cee0a292d0b9afe96a1b4a2c66910f2485af2482
Component: engine
2013-11-25 09:04:04 -08:00
cf914fd88c
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
image.go
Upstream-commit: 0cecc2a78c246a5b809954059650a4c22442e0d6
Component: engine
2013-11-21 17:18:41 -08:00
eec0335af0
Use UTC for time
...
Upstream-commit: 806abe90ba38741707f58e98ecdcdd4bc19f52e2
Component: engine
2013-11-21 16:43:36 -08:00
915356af08
Refactor State to be 100% thread safe
...
Upstream-commit: 33e70864a2c4321bf6968d6d521c159a1b72b220
Component: engine
2013-11-21 16:34:58 -08:00
f6524ff456
Handle image metadata when drivers are switched
...
Upstream-commit: 1b28cdc7f977f265d0d8de53e8ec1d773ed54db1
Component: engine
2013-11-20 10:31:51 -08:00
48e095ca19
Merge branch 'master' into vieux_merge_master
...
Conflicts:
runtime.go
Upstream-commit: cd022376b8eda39ac23debc6b52fee46e08fcfdb
Component: engine
2013-11-19 17:32:08 -08:00
ad8fb52fd4
Merge pull request #2750 from jpoimboe/simplify-register-reconnect
...
Simplify the runtime Register reconnect logic
Upstream-commit: 234f5ac39f22b02cce62d789283a4ed80b728fe2
Component: engine
2013-11-19 17:30:59 -08:00
127023e5bb
Merge pull request #53 from shykes/improve_cleanup
...
Improve aufs cleanup and debugging
Upstream-commit: d4ef551d654b6b3b91aed68152789fc2869d83fd
Component: engine
2013-11-19 17:16:36 -08:00
f762c896a3
Merge pull request #39 from crosbymichael/add-driver-flag
...
Add flag to set default graph driver
Upstream-commit: 76f54f3a28437c445c3ea216d7efd6a9a0ff0d25
Component: engine
2013-11-19 17:16:25 -08:00
32bf4b495f
improve aufs cleanup and debugging
...
Upstream-commit: 43899a77bf638d4baa42291c1988bcb2a75e8ef5
Component: engine
2013-11-19 17:12:37 -08:00
fe58dd376c
Merge pull request #50 from crosbymichael/limit-dm
...
Prohibit more than 42 layers in the core
Upstream-commit: f6629bbbd53f8a296b3f29cd4958406b79e8b383
Component: engine
2013-11-19 15:42:00 -08:00
b6950e3878
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
Upstream-commit: 28d4cbbc59e419f00c1ad75991b106241933ca5d
Component: engine
2013-11-19 14:58:12 -08:00
220d989071
simplify the runtime Register reconnect logic
...
Refactor the Register code a little bit to make it easier to comprehend.
Upstream-commit: 3cbec951772b9849c0ba679a5988b54384d05ce1
Component: engine
2013-11-19 14:09:30 -06:00
a07b5796a9
Rename AufsDriver to Driver to be consistent
...
Upstream-commit: 51a972f38d0b6e2e7a4b27509b58fc7a6e92679f
Component: engine
2013-11-19 03:27:59 -08:00
c8cec50adf
Add flag to set default graph driver
...
Remove the env var DOCKER_DRIVER
Upstream-commit: 6dbeed89c061b85551ab638f93282d87de8ab929
Component: engine
2013-11-19 02:37:44 -08:00
d0deac1a2c
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.
Upstream-commit: af753cbad8957f8c51852fdc26a25a8e43114938
Component: engine
2013-11-19 00:51:16 -08:00
2d65b723cd
Add container migration to aufs driver
...
Upstream-commit: 29f07f854497571db570be79c8df878624f5b41c
Component: engine
2013-11-18 18:39:21 -08:00
6e0c243c2e
Lintify code with confidence=1
...
Upstream-commit: 5e941f1ca035bb1ec014c18d277aecaa41deba85
Component: engine
2013-11-18 16:24:11 -08:00
6c91c91066
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.
Upstream-commit: 3c67a2849337f3b9bd92dd389f0e02e48a36028b
Component: engine
2013-11-18 17:51:47 +00:00
9d193b1c00
WIP
...
Upstream-commit: a518b847511f034d9bfd4166e17f8f0eac61d021
Component: engine
2013-11-15 17:16:30 -08:00
73e6c3f45e
rename gograph in graphdb
...
Upstream-commit: cbd1281ec998e017b579c13ee6262aa21c96c38a
Component: engine
2013-11-15 15:55:45 -08:00
052ebaaf52
Move all drivers to the same subdir graphdriver
...
Upstream-commit: 035c1442424ee502118cdbf2ee2dddafcc0f01cd
Component: engine
2013-11-15 15:48:24 -08:00
b264af0c15
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
Upstream-commit: 4908d7f81db91f4a28be152ec0cacb0cf711b403
Component: engine
2013-11-14 22:53:59 -08:00
b0ad480645
Merge pull request #34 from alexlarsson/dm-plugin-dummy-volumes
...
Use dummy driver for volumes
Upstream-commit: 2b23da1d2ff14c3f62a4c4b1ea78084598a58ca6
Component: engine
2013-11-15 09:41:16 -08:00
d77afe3b14
Merge pull request #30 from alexlarsson/dm-plugins-archive-tests
...
Dm plugins archive tests
Upstream-commit: bcf96d95bce927b23b03703f27965019e727313c
Component: engine
2013-11-15 09:38:17 -08:00
faff941ade
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.
Upstream-commit: 10f23a94f6daaf03c684937daea67d10205b4b89
Component: engine
2013-11-15 11:30:28 +01:00
