Move filetype to skylib/

mattmoor · mattmoor · commit 09726b3b6f59 · 2017-09-26T14:46:08.000Z
diff --git a/container/image.bzl b/container/image.bzl
@@ -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(
@@ -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),
diff --git a/container/import.bzl b/container/import.bzl
@@ -14,7 +14,7 @@
 """Rule for importing a container image."""
 
 load(
-    "//docker:filetype.bzl",
+    "//skylib:filetype.bzl",
     tgz_filetype = "tgz",
 )
 load(
diff --git a/skylib/filetype.bzl b/skylib/filetype.bzl
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`"""Rule for importing a container image."""`
`15`	`15`
`16`	`16`	`load(`
`17`		`- "//docker:filetype.bzl",`
	`17`	`+ "//skylib:filetype.bzl",`
`18`	`18`	`tgz_filetype = "tgz",`
`19`	`19`	`)`
`20`	`20`	`load(`
Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,5 @@ deb = [`
`29`	`29`	`".udeb",`
`30`	`30`	`]`
`31`	`31`
`32`		`-# Docker files are tarballs, should we allow other extensions than tar?`
`33`		`-docker = tar`
	`32`	`+# Container images are tarballs (when exported).`
	`33`	`+container = tar`