diff options
| author |  Googler <noreply@google.com> | 2017-04-18 23:06:07 +0200 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2017-04-19 10:48:57 +0200 |
| commit | 5d761ecc6d337bceda68df38781589e2c11967b4 (patch) | |
| tree | e6d5375da69e3cd15772779df155334a08a5e65b /tools | |
| parent | ff29c0b39cf936a2699b05edd54f483f1a037d93 (diff) | |
Move the sha256 tool into its own directory, as it isn't specific to docker_build.
PiperOrigin-RevId: 153508081
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/BUILD | 1 | ||||
| -rw-r--r-- | tools/build_defs/docker/BUILD | 6 | ||||
| -rw-r--r-- | tools/build_defs/docker/build.bzl | 3 | ||||
| -rw-r--r-- | tools/build_defs/hash/BUILD | 18 | ||||
| -rw-r--r-- | tools/build_defs/hash/hash.bzl (renamed from tools/build_defs/docker/hash.bzl) | 2 | ||||
| -rw-r--r-- | tools/build_defs/hash/sha256.py (renamed from tools/build_defs/docker/sha256.py) | 0 |
6 files changed, 22 insertions, 8 deletions
diff --git a/tools/BUILD b/tools/BUILD index 3923626a94..97b160e466 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -12,6 +12,7 @@ filegroup( "//tools/build_defs/apple:srcs", "//tools/build_defs/apple/test:srcs", "//tools/build_defs/docker:srcs", + "//tools/build_defs/hash:srcs", "//tools/build_defs/pkg:srcs", "//tools/build_defs/repo:srcs", "//tools/build_rules:srcs", diff --git a/tools/build_defs/docker/BUILD b/tools/build_defs/docker/BUILD index 4aa6b03414..1b45f0256f 100644 --- a/tools/build_defs/docker/BUILD +++ b/tools/build_defs/docker/BUILD @@ -115,12 +115,6 @@ py_test( ) py_binary( - name = "sha256", - srcs = ["sha256.py"], - visibility = ["//visibility:public"], -) - -py_binary( name = "create_image", srcs = ["create_image.py"], visibility = ["//visibility:public"], diff --git a/tools/build_defs/docker/build.bzl b/tools/build_defs/docker/build.bzl index 5dc38c8240..c969ac162b 100644 --- a/tools/build_defs/docker/build.bzl +++ b/tools/build_defs/docker/build.bzl @@ -17,7 +17,8 @@ load(":filetype.bzl", tar_filetype="tar", deb_filetype="deb", docker_filetype="docker") -load(":hash.bzl", _hash_tools="tools", _sha256="sha256") +load("//tools/build_defs/hash:hash.bzl", + _hash_tools="tools", _sha256="sha256") load(":label.bzl", _string_to_label="string_to_label") load(":layers.bzl", _assemble_image="assemble", diff --git a/tools/build_defs/hash/BUILD b/tools/build_defs/hash/BUILD new file mode 100644 index 0000000000..878ce002da --- /dev/null +++ b/tools/build_defs/hash/BUILD @@ -0,0 +1,18 @@ +licenses(["notice"]) # Apache 2.0 + +filegroup( + name = "srcs", + srcs = glob(["**"]), + visibility = ["//tools:__pkg__"], +) + +exports_files( + ["README.md"], + visibility = ["//site:__pkg__"], +) + +py_binary( + name = "sha256", + srcs = ["sha256.py"], + visibility = ["//visibility:public"], +) diff --git a/tools/build_defs/docker/hash.bzl b/tools/build_defs/hash/hash.bzl index 5d3b52c568..62741540b2 100644 --- a/tools/build_defs/docker/hash.bzl +++ b/tools/build_defs/hash/hash.bzl @@ -27,7 +27,7 @@ def sha256(ctx, artifact): tools = { "sha256": attr.label( - default=Label("//tools/build_defs/docker:sha256"), + default=Label("//tools/build_defs/hash:sha256"), cfg="host", executable=True, allow_files=True) diff --git a/tools/build_defs/docker/sha256.py b/tools/build_defs/hash/sha256.py index b1e062436d..b1e062436d 100644 --- a/tools/build_defs/docker/sha256.py +++ b/tools/build_defs/hash/sha256.py |