fix: updated docker image path to be included in graph config

Author: abhishekmadan30

src/taskgraph/config.py

@@ -26,6 +26,10 @@
         # The trust-domain for this graph.
         # (See https://firefox-source-docs.mozilla.org/taskcluster/taskcluster/taskgraph.html#taskgraph-trust-domain)  # noqa
         Required("trust-domain"): str,
+        Optional(
+            "docker-image-path",
+            description="Paths to the docker image directories relative to the root directory.",
+        ): [str],
         Required("task-priority"): optionally_keyed_by(
             "project",
             "level",

src/taskgraph/transforms/task.py

@@ -561,7 +561,7 @@ def build_docker_worker_payload(config, task, task_def):
     image = worker["docker-image"]
     if isinstance(image, dict):
         if "in-tree" in image:
-            name = image["in-tree"]
+            file_path = config.graph_config["docker-image-path"]
             docker_image_task = "docker-image-" + image["in-tree"]
             assert "docker-image" not in task.get("dependencies", ()), (
                 "docker-image key in dependencies object is reserved"
@@ -575,7 +575,7 @@ def build_docker_worker_payload(config, task, task_def):
             }
 
             # Find VOLUME in Dockerfile.
-            volumes = dockerutil.parse_volumes(name)
+            volumes = dockerutil.parse_volumes(file_path)
             for v in sorted(volumes):
                 if v in worker["volumes"]:
                     raise Exception(

src/taskgraph/util/docker.py

@@ -14,8 +14,6 @@
 
 IMAGE_DIR = os.path.join(".", "taskcluster", "docker")
 
-from .yaml import load_yaml
-
 
 def docker_image(name: str, by_tag: bool = False) -> Optional[str]:
     """
@@ -206,30 +204,11 @@ def stream_context_tar(topsrcdir, context_dir, out_file, args=None):
 
 
 @functools.lru_cache(maxsize=None)
-def image_paths():
-    """Return a map of image name to paths containing their Dockerfile."""
-    config = load_yaml("taskcluster", "kinds", "docker-image", "kind.yml")
-    return {
-        k: os.path.join(IMAGE_DIR, v.get("definition", k))
-        for k, v in config["tasks"].items()
-    }
-
-
-def image_path(name):
-    paths = image_paths()
-    if name in paths:
-        return paths[name]
-    return os.path.join(IMAGE_DIR, name)
-
-
-@functools.lru_cache(maxsize=None)
-def parse_volumes(image):
+def parse_volumes(file_path):
     """Parse VOLUME entries from a Dockerfile for an image."""
     volumes = set()
 
-    path = image_path(image)
-
-    with open(os.path.join(path, "Dockerfile"), "rb") as fh:
+    with open(file_path, "rb") as fh:
         for line in fh:
             line = line.strip()
             # We assume VOLUME definitions don't use %ARGS.