Michael Crosby
eace2dbe1d
Merge branch 'dm-plugin-new-ChangesDirs' of https://github.com/alexlarsson/docker into alexlarsson-dm-plugin-new-ChangesDirs
...
Conflicts:
archive/changes.go
2013-11-14 12:23:01 -08:00
Solomon Hykes
099c53b28e
Merge pull request #29 from crosbymichael/try-load-aufs
...
Try to load aufs first then check in filesystems for aufs support
2013-11-14 10:11:19 -08:00
Michael Crosby
7b2d59b91e
Try to load aufs first then check in filesystems for aufs support
2013-11-14 09:42:12 -08:00
Guillaume J. Charmes
529c30261e
Merge pull request #28 from crosbymichael/close-sparse-files
...
Close sparse files when done
2013-11-14 07:02:47 -08:00
Michael Crosby
bbc9fc7907
Close sparse files when done
2013-11-13 17:05:32 -08:00
Michael Crosby
7682ec04cd
Merge pull request #27 from shykes/refactor_dm
...
Add more dm unit tests
2013-11-13 16:50:26 -08:00
Guillaume J. Charmes
590465b395
Merge branch 'shykes-0.6.5-dm-plugin' into refactor_dm
2013-11-13 16:47:37 -08:00
Guillaume J. Charmes
05d70cbcf4
More dm unit tests
2013-11-13 16:46:10 -08:00
Michael Crosby
539708aa8a
Merge pull request #26 from shykes/refactor_dm
...
Refactor dm
2013-11-13 15:45:58 -08:00
Guillaume J. Charmes
3aaef96e36
Merge branch 'shykes-0.6.5-dm-plugin' into refactor_dm
2013-11-13 15:44:13 -08:00
Guillaume J. Charmes
921e2e9ae2
Merge pull request #25 from crosbymichael/add-aufs-diff-test
...
Add test for ApplyDiff
2013-11-13 15:43:26 -08:00
Guillaume J. Charmes
b50838c359
Merge pull request #24 from crosbymichael/dm-tests
...
Add device mapper tests for driver.go
2013-11-13 15:41:59 -08:00
Guillaume J. Charmes
4bebca848e
Add devmapper_test.go
2013-11-13 15:35:52 -08:00
Michael Crosby
6b3dd02bb8
Add test coverage for devicemapper driver.go
2013-11-13 14:56:26 -08:00
Michael Crosby
80e7319558
Make sure setInitialized is called when device is mounted
2013-11-13 14:54:47 -08:00
Guillaume J. Charmes
1d188c8737
Create devmapper_wrapper.go
2013-11-13 14:36:31 -08:00
Michael Crosby
a69d86e0b1
Add test for ApplyDiff
2013-11-13 11:03:56 -08:00
Guillaume J. Charmes
46ab7d1e8a
Merge pull request #15 from alexlarsson/dm-plugin-explicit-init
...
Remove devicemapper lazy initialization
2013-11-13 10:46:24 -08:00
Guillaume J. Charmes
e3597624dd
Merge pull request #23 from crosbymichael/ignore-dir-sizes
...
Ignore dir sizes in TreeSize func
2013-11-13 10:40:03 -08:00
Michael Crosby
a4f14528c2
Ignore dir sizes in TreeSize func
2013-11-13 10:33:24 -08:00
Michael Crosby
a06edd77e5
Merge pull request #22 from shykes/shykes-0.6.5-dm-plugin
...
Fix ImageTree test
2013-11-12 12:30:30 -08:00
Guillaume J. Charmes
08623dc216
Fix ImageTree test
2013-11-12 12:25:35 -08:00
Guillaume J. Charmes
50d80a8938
Merge pull request #17 from alexlarsson/dm-plugin-whiteout-directory
...
archive.ApplyLayer() - handle directory whiteouts
2013-11-12 12:16:30 -08:00
Alexander Larsson
6f3c32eb18
archive.ApplyLayer() - handle directory whiteouts
...
When directories are white-outed we can get called with the previously
removed directories. Handle this with os.IsNotExist(error).
2013-11-12 21:14:54 +01:00
Guillaume J. Charmes
0dd92d8f1c
Merge pull request #21 from crosbymichael/pull-parent-layers
...
Pull parent layers first before children
2013-11-12 11:50:20 -08:00
Michael Crosby
7301fbe035
Pull parent layers first before children
2013-11-12 11:48:35 -08:00
Guillaume J. Charmes
4ec05b5dbf
Merge pull request #20 from crosbymichael/force-driver-to-implement-differ
...
Force driver to implement differ
2013-11-12 11:48:20 -08:00
Michael Crosby
5d9723002b
Allow drivers to implement ApplyDiff in Differ interface
2013-11-11 19:09:57 -08:00
Michael Crosby
2c7f50a77d
Add ability to exclude files from tar
2013-11-11 14:30:38 -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
Solomon Hykes
ec6fe9f200
Hack: set NONUKE environment variable to run the tests without cleanup, to investigate temp directories
2013-11-11 18:56:21 +00:00
Solomon Hykes
e87c3ea342
Merge pull request #19 from alexlarsson/dm-plugin-Diff-fallback
...
Implement fallback operation for driver.Diff()
2013-11-11 10:09:12 -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
Alexander Larsson
b6ef4bc952
archive.ChagesDir() - faster and better implementation
...
This replaces the current version with the latest version from the
dm branch. Advantages in this version:
We only scan each directory tree once, which means less i/o and less chance
of container changes inbetween the two scans causing inconsistencies.
We avoid comparing some fields for change detection:
* Inode
* size-in-blocks
These can change during a copy operation (e.g. in the dummy backend)
without needing to actually reflect a change in content or metadata.
* Ctime
Any copy operation will create a new Ctime value, and there is no
API to change it to the "source" value.
* size for directories
The size of a directory doesn't have to be the same just because you
recreated the same content as another director. Internal details in
the filesystem may make these different with no "real" change.
2013-11-11 14:51:19 +01:00
Alexander Larsson
b5795749d1
Remove devicemapper lazy initialization
...
We now always initialize devicemapper on startup, so
no need for the code that did lazy initialization, we
just delete it.
2013-11-11 13:29:27 +01:00
Solomon Hykes
948bb29d27
Don't use drivers to store temporary image downloads
2013-11-09 00:53:58 +00: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
f30c660f6f
Merge pull request #12 from crosbymichael/core-driver-test-failures
...
Core driver test failures
2013-11-08 16:33:53 -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 Crosby
9514767587
Allow driver to provide changes if it impl the Changer interface
2013-11-08 14:54:20 -08:00
Michael Crosby
f512049c8f
Add unit test for child changes diff in aufs
2013-11-08 12:25:17 -08:00
Michael Crosby
20f690f176
Make sure dirs are created before injecting file
2013-11-08 12:06:15 -08:00
Michael Crosby
6669c86fdf
Use tmp dir in driver home
2013-11-08 11:56:34 -08:00
Solomon Hykes
78ef0bd998
Merge pull request #6 from alexlarsson/fix-ApplyLayer-remove
...
archive.ApplyLayer() remove files recursively
2013-11-08 11:46:55 -08:00
Solomon Hykes
c1563de7a1
Merge pull request #10 from crosbymichael/aufs-fixes
...
Aufs fixes and driver dir namespaceing
2013-11-08 11:45:45 -08:00
Michael Crosby
08a276986c
Name sure drivers are confined into their own dir
2013-11-08 11:36:58 -08:00
Michael Crosby
ed18844613
Implement changes for aufs driver
2013-11-08 11:10:33 -08:00
Michael Crosby
52f31657cc
Do not remove mountpoint on umount
2013-11-08 10:17:51 -08:00
Michael Crosby
6d0b3f350e
Merge pull request #9 from crosbymichael/fix-aufs-tests
...
Fix aufs error at startup
2013-11-08 09:55:24 -08:00