diff options
| author | Joffrey F <joffrey@docker.com> | 2018-03-27 10:22:17 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2018-03-27 10:23:36 -0700 |
| commit | cb99cc6915b81c4b5959ccfabd8e671463a9c179 (patch) | |
| tree | cb24b2d8ce9e07f0f85ac8d704efeae65ed02681 | |
| parent | cdbbb06a9500373c473af58b5be47c1ef9ec1ae5 (diff) | |
| download | docker-py-c5823-out-of-ctx-dockerfile.tar.gz | |
Improve extra_files override checkc5823-out-of-ctx-dockerfile
Signed-off-by: Joffrey F <joffrey@docker.com>
| -rw-r--r-- | docker/utils/build.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/utils/build.py b/docker/utils/build.py index 783273e..b644c9f 100644 --- a/docker/utils/build.py +++ b/docker/utils/build.py @@ -152,8 +152,9 @@ def create_archive(root, files=None, fileobj=None, gzip=False, t = tarfile.open(mode='w:gz' if gzip else 'w', fileobj=fileobj) if files is None: files = build_file_list(root) + extra_names = set(e[0] for e in extra_files) for path in files: - if path in [e[0] for e in extra_files]: + if path in extra_names: # Extra files override context files with the same name continue full_path = os.path.join(root, path) |