Migrate the layers.bzl utilities to container/

mattmoor · mattmoor · commit 3e09d09fd501 · 2017-09-26T14:46:08.000Z
diff --git a/container/BUILD b/container/BUILD
@@ -16,3 +16,28 @@ package(default_visibility = ["//visibility:public"])
 licenses(["notice"])  # Apache 2.0
 
 exports_files(["push-tag.sh.tpl"])
+
+filegroup(
+    name = "incremental_load_template",
+    srcs = ["incremental_load.sh.tpl"],
+    visibility = ["//visibility:public"],
+)
+
+py_binary(
+    name = "extract_config",
+    srcs = ["extract_config.py"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "@containerregistry//:containerregistry",
+    ],
+)
+
+py_binary(
+    name = "join_layers",
+    srcs = ["join_layers.py"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//docker:utils",
+        "@containerregistry//:containerregistry",
+    ],
+)
diff --git a/container/bundle.bzl b/container/bundle.bzl
@@ -18,7 +18,7 @@ load(
     _string_to_label = "string_to_label",
 )
 load(
-    "//docker:layers.bzl",
+    "//container:layers.bzl",
     _assemble_image = "assemble",
     _get_layers = "get_from_target",
     _incr_load = "incremental_load",
diff --git a/container/extract_config.py b/container/extract_config.py
diff --git a/container/flatten.bzl b/container/flatten.bzl
@@ -18,7 +18,7 @@ load(
     _get_runfile_path = "runfile",
 )
 load(
-    "//docker:layers.bzl",
+    "//container:layers.bzl",
     _get_layers = "get_from_target",
     _layer_tools = "tools",
 )
diff --git a/container/import.bzl b/container/import.bzl
@@ -27,7 +27,7 @@ load(
     _gunzip = "gunzip",
 )
 load(
-    "//docker:layers.bzl",
+    "//container:layers.bzl",
     _assemble_image = "assemble",
     _incr_load = "incremental_load",
     _layer_tools = "tools",
diff --git a/container/incremental_load.sh.tpl b/container/incremental_load.sh.tpl
diff --git a/container/join_layers.py b/container/join_layers.py
diff --git a/container/layers.bzl b/container/layers.bzl
@@ -163,18 +163,18 @@ def incremental_load(ctx, images, output,
 
 tools = {
     "incremental_load_template": attr.label(
-        default = Label("//docker:incremental_load_template"),
+        default = Label("//container:incremental_load_template"),
         single_file = True,
         allow_files = True,
     ),
     "join_layers": attr.label(
-        default = Label("//docker:join_layers"),
+        default = Label("//container:join_layers"),
         cfg = "host",
         executable = True,
         allow_files = True,
     ),
     "extract_config": attr.label(
-        default = Label("//docker:extract_config"),
+        default = Label("//container:extract_config"),
         cfg = "host",
         executable = True,
         allow_files = True,
diff --git a/container/push.bzl b/container/push.bzl
@@ -22,7 +22,7 @@ load(
     "runfile",
 )
 load(
-    "//docker:layers.bzl",
+    "//container:layers.bzl",
     _get_layers = "get_from_target",
     _layer_tools = "tools",
 )
diff --git a/docker/BUILD b/docker/BUILD
@@ -87,8 +87,6 @@ sh_test(
     data = TEST_DATA + ["testenv.sh"],
 )
 
-# Used by docker_build and friends
-
 py_binary(
     name = "create_image_config",
     srcs = ["create_image_config.py"],
@@ -99,25 +97,6 @@ py_binary(
     ],
 )
 
-py_binary(
-    name = "extract_config",
-    srcs = ["extract_config.py"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "@containerregistry//:containerregistry",
-    ],
-)
-
-py_binary(
-    name = "join_layers",
-    srcs = ["join_layers.py"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":utils",
-        "@containerregistry//:containerregistry",
-    ],
-)
-
 py_library(
     name = "utils",
     srcs = [
@@ -126,12 +105,6 @@ py_library(
     ],
 )
 
-filegroup(
-    name = "incremental_load_template",
-    srcs = ["incremental_load.sh.tpl"],
-    visibility = ["//visibility:public"],
-)
-
 py_binary(
     name = "build_tar",
     srcs = ["build_tar.py"],
diff --git a/docker/build.bzl b/docker/build.bzl
@@ -59,7 +59,7 @@ load(
     _string_to_label = "string_to_label",
 )
 load(
-    ":layers.bzl",
+    "//container:layers.bzl",
     _assemble_image = "assemble",
     _get_layers = "get_from_target",
     _incr_load = "incremental_load",
diff --git a/docker/utils.py b/docker/utils.py
@@ -13,9 +13,6 @@
 # limitations under the License.
 """This package contains various functions used when building containers."""
 
-import json
-import tarfile
-
 
 def ExtractValue(value):
   """Return the contents of a file point to by value if it starts with an @.
@@ -30,40 +27,3 @@ def ExtractValue(value):
     with open(value[1:], 'r') as f:
       value = f.read()
   return value
-
-
-def GetTarFile(f, name):
-  """Returns the content of a file inside a tar file.
-
-  This method looks for ./f, /f and f file entry in a tar file and if found,
-  return its content. This allows to read file with various path prefix.
-
-  Args:
-    f: The tar file to read.
-    name: The name of the file inside the tar file.
-
-  Returns:
-    The content of the file, or None if not found.
-  """
-  with tarfile.open(f, 'r') as tar:
-    members = [tarinfo.name for tarinfo in tar.getmembers()]
-    for i in ['', './', '/']:
-      if i + name in members:
-        return tar.extractfile(i + name).read()
-    return None
-
-
-def GetManifestFromTar(f=None):
-  """Returns the manifest array from a tar file.
-
-  Args:
-    f: The tar file to read.
-
-  Returns:
-    The content of the manifest file or an empty array if not found.
-  """
-  if f:
-    raw_manifest_data = GetTarFile(f, 'manifest.json')
-    if raw_manifest_data:
-      return json.loads(raw_manifest_data)
-  return []

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ load(`
`18`	`18`	`_string_to_label = "string_to_label",`
`19`	`19`	`)`
`20`	`20`	`load(`
`21`		`- "//docker:layers.bzl",`
	`21`	`+ "//container:layers.bzl",`
`22`	`22`	`_assemble_image = "assemble",`
`23`	`23`	`_get_layers = "get_from_target",`
`24`	`24`	`_incr_load = "incremental_load",`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ load(`
`27`	`27`	`_gunzip = "gunzip",`
`28`	`28`	`)`
`29`	`29`	`load(`
`30`		`- "//docker:layers.bzl",`
	`30`	`+ "//container:layers.bzl",`
`31`	`31`	`_assemble_image = "assemble",`
`32`	`32`	`_incr_load = "incremental_load",`
`33`	`33`	`_layer_tools = "tools",`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ load(`
`22`	`22`	`"runfile",`
`23`	`23`	`)`
`24`	`24`	`load(`
`25`		`- "//docker:layers.bzl",`
	`25`	`+ "//container:layers.bzl",`
`26`	`26`	`_get_layers = "get_from_target",`
`27`	`27`	`_layer_tools = "tools",`
`28`	`28`	`)`