Skip to content

Commit f39c0dc

Browse files
committed
Improve extra_files override check
Signed-off-by: Joffrey F <[email protected]>
1 parent fce99c3 commit f39c0dc

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

docker/utils/build.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,9 @@ def create_archive(root, files=None, fileobj=None, gzip=False,
152152
t = tarfile.open(mode='w:gz' if gzip else 'w', fileobj=fileobj)
153153
if files is None:
154154
files = build_file_list(root)
155+
extra_names = set(e[0] for e in extra_files)
155156
for path in files:
156-
if path in [e[0] for e in extra_files]:
157+
if path in extra_names:
157158
# Extra files override context files with the same name
158159
continue
159160
full_path = os.path.join(root, path)

0 commit comments

Comments
 (0)