diff options
| author |  vladmos <vladmos@google.com> | 2018-01-03 12:20:57 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-01-03 12:22:55 -0800 |
| commit | ceaed5145f5ad27facd103a79d047cf0e301b4b5 (patch) | |
| tree | 86d92a80caa06522c5f21ea971b3b692d3520016 /tools/build_defs/docker | |
| parent | e981d20dafc268ff9c1b5e23452e060327a0ace2 (diff) | |
Remove usages of `+` on dicts
The `+` operator on dicts is deprecated and will be removed. This change makes
Bazel files compatible with the new behavior.
Fixes #4346.
PiperOrigin-RevId: 180702882
Diffstat (limited to 'tools/build_defs/docker')
| -rw-r--r-- | tools/build_defs/docker/build.bzl | 4 | ||||
| -rw-r--r-- | tools/build_defs/docker/bundle.bzl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/build_defs/docker/build.bzl b/tools/build_defs/docker/build.bzl index f60ccbdea8..bd9da71848 100644 --- a/tools/build_defs/docker/build.bzl +++ b/tools/build_defs/docker/build.bzl @@ -315,7 +315,7 @@ def _docker_build_impl(ctx): docker_build_ = rule( implementation = _docker_build_impl, - attrs = { + attrs = dict({ "base": attr.label(allow_files=docker_filetype), "data_path": attr.string(), "directory": attr.string(default="/"), @@ -358,7 +358,7 @@ docker_build_ = rule( cfg="host", executable=True, allow_files=True) - } + _hash_tools + _layer_tools, + }.items() + _hash_tools.items() + _layer_tools.items()), outputs = { "out": "%{name}.tar", "layer": "%{name}-layer.tar", diff --git a/tools/build_defs/docker/bundle.bzl b/tools/build_defs/docker/bundle.bzl index fa11b12f5b..7aca21553b 100644 --- a/tools/build_defs/docker/bundle.bzl +++ b/tools/build_defs/docker/bundle.bzl @@ -68,12 +68,12 @@ def _docker_bundle_impl(ctx): docker_bundle_ = rule( implementation = _docker_bundle_impl, - attrs = { + attrs = dict({ "images": attr.string_dict(), # Implicit dependencies. "image_targets": attr.label_list(allow_files=True), "image_target_strings": attr.string_list(), - } + _layer_tools, + }.items() + _layer_tools.items()), outputs = { "out": "%{name}.tar", }, |