diff options
author | Ian Campbell <ijc@users.noreply.github.com> | 2019-05-20 15:35:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-20 15:35:48 +0100 |
commit | 263d18ce934cba81239354a24b30eb8d2f8091a0 (patch) | |
tree | 596ba68a5bba8311ba6a41f19442def16ab5bdb1 | |
parent | 9de6ec3700e04fa8046a42f9d2f31269d7d507a0 (diff) | |
parent | 51ee6093df9947b4e77ff679d9d587b1d0164fa2 (diff) |
Merge pull request #6624 from orisano/feat-empty-cache-from
feat: drop empty tag on cache_from
-rw-r--r-- | compose/service.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/compose/service.py b/compose/service.py index af9b10ba..0db35438 100644 --- a/compose/service.py +++ b/compose/service.py @@ -1078,7 +1078,7 @@ class Service(object): pull=pull, nocache=no_cache, dockerfile=build_opts.get('dockerfile', None), - cache_from=build_opts.get('cache_from', None), + cache_from=self.get_cache_from(build_opts), labels=build_opts.get('labels', None), buildargs=build_args, network_mode=build_opts.get('network', None), @@ -1116,6 +1116,12 @@ class Service(object): return image_id + def get_cache_from(self, build_opts): + cache_from = build_opts.get('cache_from', None) + if cache_from is not None: + cache_from = [tag for tag in cache_from if tag] + return cache_from + def can_be_built(self): return 'build' in self.options |