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

Ignore comment line from the .dockerignore file 

This fixed the bug that test comment line in .dockerignore file as ignore rule
bug.

Add test for "# comment" patterns in .dockerignore.

Signed-off-by: Wanzhi Du <wanzhi09@gmail.com>
This commit is contained in:
Wanzhi Du 2018-03-05 18:01:22 +08:00
parent 9b8e022fa1
commit 7a28ff3510
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/api/build.py
View File

@ -143,7 +143,7 @@ class BuildApiMixin(object):
if os.path.exists(dockerignore): if os.path.exists(dockerignore):
with open(dockerignore, 'r') as f: with open(dockerignore, 'r') as f:
exclude = list(filter( exclude = list(filter(
bool, [l.strip() for l in f.read().splitlines()] lambda x: x != '' and x[0] != '#', [l.strip() for l in f.read().splitlines()]
)) ))
context = utils.tar( context = utils.tar(
path, exclude=exclude, dockerfile=dockerfile, gzip=gzip path, exclude=exclude, dockerfile=dockerfile, gzip=gzip

3
tests/integration/api_build_test.py
View File

@ -61,7 +61,8 @@ class BuildTest(BaseAPIIntegrationTest):
'Dockerfile', 'Dockerfile',
'.dockerignore', '.dockerignore',
'!ignored/subdir/excepted-file', '!ignored/subdir/excepted-file',
'', # empty line '', # empty line,
'#', # comment line
])) ]))
with open(os.path.join(base_dir, 'not-ignored'), 'w') as f: with open(os.path.join(base_dir, 'not-ignored'), 'w') as f: