docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #366 from sgjesse/tar-directories 

Add directories to the Docker context
This commit is contained in:
Joffrey F 2014-10-29 16:58:39 +01:00
parent 4ed1ee5b0f a6af1b7fd4
commit 217f97259b
2 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/utils/utils.py
View File

@ -72,6 +72,10 @@ def tar(path, exclude=None):
for name in fnames: for name in fnames:
arcname = os.path.join(relpath, name) arcname = os.path.join(relpath, name)
t.add(os.path.join(path, arcname), arcname=arcname) t.add(os.path.join(path, arcname), arcname=arcname)
for name in dirnames:
arcname = os.path.join(relpath, name)
t.add(os.path.join(path, arcname),
arcname=arcname, recursive=False)
t.close() t.close()
f.seek(0) f.seek(0)
return f return f

41
tests/test.py
View File

@ -1615,16 +1615,47 @@ class DockerClientTest(Cleanup, unittest.TestCase):
f.write("content") f.write("content")
for exclude, names in ( for exclude, names in (
(['*.py'], ['bar/a.txt', 'bar/other.png', (['*.py'], ['bar', 'bar/a.txt', 'bar/other.png',
'test/foo/a.txt', 'test/foo/other.png']), 'test', 'test/foo', 'test/foo/a.txt',
(['*.png', 'bar'], ['test/foo/a.txt', 'test/foo/b.py']), 'test/foo/other.png']),
(['test/foo', 'a.txt'], ['bar/a.txt', 'bar/b.py', (['*.png', 'bar'], ['test', 'test/foo', 'test/foo/a.txt',
'bar/other.png']), 'test/foo/b.py']),
(['test/foo', 'a.txt'], ['bar', 'bar/a.txt', 'bar/b.py',
'bar/other.png', 'test']),
): ):
archive = docker.utils.tar(base, exclude=exclude) archive = docker.utils.tar(base, exclude=exclude)
tar = tarfile.open(fileobj=archive) tar = tarfile.open(fileobj=archive)
self.assertEqual(sorted(tar.getnames()), names) self.assertEqual(sorted(tar.getnames()), names)
def test_tar_with_empty_directory(self):
base = tempfile.mkdtemp()
self.addCleanup(shutil.rmtree, base)
for d in ['foo', 'bar']:
os.makedirs(os.path.join(base, d))
archive = docker.utils.tar(base)
tar = tarfile.open(fileobj=archive)
self.assertEqual(sorted(tar.getnames()), ['bar', 'foo'])
def test_tar_with_file_symlinks(self):
base = tempfile.mkdtemp()
self.addCleanup(shutil.rmtree, base)
with open(os.path.join(base, 'foo'), 'w') as f:
f.write("content")
os.makedirs(os.path.join(base, 'bar'))
os.symlink('../foo', os.path.join(base, 'bar/foo'))
archive = docker.utils.tar(base)
tar = tarfile.open(fileobj=archive)
self.assertEqual(sorted(tar.getnames()), ['bar', 'bar/foo', 'foo'])
def test_tar_with_directory_symlinks(self):
base = tempfile.mkdtemp()
self.addCleanup(shutil.rmtree, base)
for d in ['foo', 'bar']:
os.makedirs(os.path.join(base, d))
os.symlink('../foo', os.path.join(base, 'bar/foo'))
archive = docker.utils.tar(base)
tar = tarfile.open(fileobj=archive)
self.assertEqual(sorted(tar.getnames()), ['bar', 'bar/foo', 'foo'])
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()