Skip to content

Commit

Permalink
Move filetype to skylib/
Browse files Browse the repository at this point in the history
  • Loading branch information
mattmoor committed Sep 26, 2017
1 parent 5178ef0 commit 09726b3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions container/image.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ expectation in such cases is that users will write something like:
"""

load(
"//docker:filetype.bzl",
"//skylib:filetype.bzl",
container_filetype = "container",
deb_filetype = "deb",
docker_filetype = "docker",
tar_filetype = "tar",
)
load(
Expand Down Expand Up @@ -304,7 +304,7 @@ def _impl(ctx, files=None, file_map=None, empty_files=None, directory=None,
docker_parts = container_parts)

_attrs = {
"base": attr.label(allow_files = docker_filetype),
"base": attr.label(allow_files = container_filetype),
"data_path": attr.string(),
"directory": attr.string(default = "/"),
"tars": attr.label_list(allow_files = tar_filetype),
Expand Down
2 changes: 1 addition & 1 deletion container/import.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"""Rule for importing a container image."""

load(
"//docker:filetype.bzl",
"//skylib:filetype.bzl",
tgz_filetype = "tgz",
)
load(
Expand Down
4 changes: 2 additions & 2 deletions docker/filetype.bzl → skylib/filetype.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ deb = [
".udeb",
]

# Docker files are tarballs, should we allow other extensions than tar?
docker = tar
# Container images are tarballs (when exported).
container = tar

0 comments on commit 09726b3

Please sign in to comment.