flyte 2.0.0b23__py3-none-any.whl → 2.0.0b25__py3-none-any.whl

flyte/_initialize.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import functools
 import threading
 import typing
-from dataclasses import dataclass, replace
+from dataclasses import dataclass, field, replace
 from pathlib import Path
 from typing import TYPE_CHECKING, Callable, List, Literal, Optional, TypeVar
 
@@ -41,6 +41,7 @@ class _InitConfig(CommonInit):
     client: Optional[ClientSet] = None
     storage: Optional[Storage] = None
     image_builder: "ImageBuildEngine.ImageBuilderType" = "local"
+    images: typing.Dict[str, str] = field(default_factory=dict)
 
     def replace(self, **kwargs) -> _InitConfig:
         return replace(self, **kwargs)
@@ -141,6 +142,7 @@ async def init(
     storage: Storage | None = None,
     batch_size: int = 1000,
     image_builder: ImageBuildEngine.ImageBuilderType = "local",
+    images: typing.Dict[str, str] | None = None,
     source_config_path: Optional[Path] = None,
 ) -> None:
     """
@@ -170,40 +172,18 @@ async def init(
     :param ca_cert_file_path: [optional] str Root Cert to be loaded and used to verify admin
     :param http_proxy_url: [optional] HTTP Proxy to be used for OAuth requests
     :param rpc_retries: [optional] int Number of times to retry the platform calls
-    :param audience: oauth2 audience for the token request. This is used to validate the token
     :param insecure: insecure flag for the client
     :param storage: Optional blob store (S3, GCS, Azure) configuration if needed to access (i.e. using Minio)
     :param org: Optional organization override for the client. Should be set by auth instead.
     :param batch_size: Optional batch size for operations that use listings, defaults to 1000, so limit larger than
       batch_size will be split into multiple requests.
     :param image_builder: Optional image builder configuration, if not provided, the default image builder will be used.
+    :param images: Optional dict of images that can be used by referencing the image name.
     :param source_config_path: Optional path to the source configuration file (This is only used for documentation)
     :return: None
     """
     from flyte._utils import get_cwd_editable_install, org_from_endpoint, sanitize_endpoint
 
-    if endpoint or api_key:
-        if project is None:
-            raise ValueError(
-                "Project must be provided to initialize the client. "
-                "Please set 'project' in the 'task' section of your config file, "
-                "or pass it directly to flyte.init(project='your-project-name')."
-            )
-
-        if domain is None:
-            raise ValueError(
-                "Domain must be provided to initialize the client. "
-                "Please set 'domain' in the 'task' section of your config file, "
-                "or pass it directly to flyte.init(domain='your-domain-name')."
-            )
-
-        if org is None and org_from_endpoint(endpoint) is None:
-            raise ValueError(
-                "Organization must be provided to initialize the client. "
-                "Please set 'org' in the 'task' section of your config file, "
-                "or pass it directly to flyte.init(org='your-org-name')."
-            )
-
     _initialize_logger(log_level=log_level)
 
     global _init_config  # noqa: PLW0603
@@ -238,7 +218,7 @@ async def init(
             else:
                 logger.info("No editable install found, using current working directory as root directory.")
                 root_dir = Path.cwd()
-        root_dir = root_dir or get_cwd_editable_install() or Path.cwd()
+
         _init_config = _InitConfig(
             root_dir=root_dir,
             project=project,
@@ -248,6 +228,7 @@ async def init(
             org=org or org_from_endpoint(endpoint),
             batch_size=batch_size,
             image_builder=image_builder,
+            images=images or {},
             source_config_path=source_config_path,
         )
 
@@ -258,6 +239,7 @@ async def init_from_config(
     root_dir: Path | None = None,
     log_level: int | None = None,
     storage: Storage | None = None,
+    images: tuple[str, ...] | None = None,
 ) -> None:
     """
     Initialize the Flyte system using a configuration file or Config object. This method should be called before any
@@ -276,6 +258,7 @@ async def init_from_config(
     from rich.highlighter import ReprHighlighter
 
     import flyte.config as config
+    from flyte.cli._common import parse_images
 
     cfg: config.Config
     cfg_path: Optional[Path] = None
@@ -301,6 +284,9 @@ async def init_from_config(
 
     logger.info(f"Flyte config initialized as {cfg}", extra={"highlighter": ReprHighlighter()})
 
+    # parse image, this will overwrite the image_refs set in the config file
+    parse_images(cfg, images)
+
     await init.aio(
         org=cfg.task.org,
         project=cfg.task.project,
@@ -317,6 +303,7 @@ async def init_from_config(
         root_dir=root_dir,
         log_level=log_level,
         image_builder=cfg.image.builder,
+        images=cfg.image.image_refs,
         storage=storage,
         source_config_path=cfg_path,
     )
@@ -332,7 +319,7 @@ def _get_init_config() -> Optional[_InitConfig]:
         return _init_config
 
 
-def get_common_config() -> CommonInit:
+def get_init_config() -> _InitConfig:
     """
     Get the current initialization configuration. Thread-safe implementation.
 
@@ -490,6 +477,34 @@ def requires_initialization(func: T) -> T:
     return typing.cast(T, wrapper)
 
 
+def require_project_and_domain(func):
+    """
+    Decorator that ensures the current Flyte configuration defines
+    both 'project' and 'domain'. Raises a clear error if not found.
+    """
+
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        cfg = get_init_config()
+        if cfg.project is None:
+            raise ValueError(
+                "Project must be provided to initialize the client. "
+                "Please set 'project' in the 'task' section of your config file, "
+                "or pass it directly to flyte.init(project='your-project-name')."
+            )
+
+        if cfg.domain is None:
+            raise ValueError(
+                "Domain must be provided to initialize the client. "
+                "Please set 'domain' in the 'task' section of your config file, "
+                "or pass it directly to flyte.init(domain='your-domain-name')."
+            )
+
+        return func(*args, **kwargs)
+
+    return wrapper
+
+
 async def _init_for_testing(
     project: str | None = None,
     domain: str | None = None,
@@ -519,3 +534,31 @@ def replace_client(client):
 
     with _init_lock:
         _init_config = _init_config.replace(client=client)
+
+
+def current_domain() -> str:
+    """
+    Returns the current domain from Runtime environment (on the cluster) or from the initialized configuration.
+    This is safe to be used during `deploy`, `run` and within `task` code.
+
+    NOTE: This will not work if you deploy a task to a domain and then run it in another domain.
+
+    Raises InitializationError if the configuration is not initialized or domain is not set.
+    :return: The current domain
+    """
+    from ._context import ctx
+
+    tctx = ctx()
+    if tctx is not None:
+        domain = tctx.action.domain
+        if domain is not None:
+            return domain
+
+    cfg = _get_init_config()
+    if cfg is None or cfg.domain is None:
+        raise InitializationError(
+            "DomainNotInitializedError",
+            "user",
+            "Domain has not been initialized. Call flyte.init() with a valid domain before using this function.",
+        )
+    return cfg.domain

flyte/_internal/controllers/_local_controller.py

@@ -186,6 +186,7 @@ class LocalController:
         tctx = ctx.data.task_context
         if not tctx:
             raise flyte.errors.NotInTaskContextError("BadContext", "Task context not initialized")
+
         converted_inputs = convert.Inputs.empty()
         if _interface.inputs:
             converted_inputs = await convert.convert_from_native_to_inputs(_interface, *args, **kwargs)

flyte/_internal/controllers/_trace.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field
 from typing import Any, Optional
 
-from flyteidl.core import interface_pb2
+from flyteidl2.core import interface_pb2
 
 from flyte.models import ActionID, NativeInterface
 

flyte/_internal/controllers/remote/_action.py

@@ -3,16 +3,15 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Literal, Optional
 
-from flyteidl.core import execution_pb2, interface_pb2
-from google.protobuf import timestamp_pb2
-
-from flyte._protos.common import identifier_pb2
-from flyte._protos.workflow import (
-    queue_service_pb2,
+from flyteidl2.common import identifier_pb2
+from flyteidl2.core import execution_pb2, interface_pb2
+from flyteidl2.task import common_pb2, task_definition_pb2
+from flyteidl2.workflow import (
     run_definition_pb2,
     state_service_pb2,
-    task_definition_pb2,
 )
+from google.protobuf import timestamp_pb2
+
 from flyte.models import GroupData
 
 ActionType = Literal["task", "trace"]
@@ -31,7 +30,7 @@ class Action:
     friendly_name: str | None = None
     group: GroupData | None = None
     task: task_definition_pb2.TaskSpec | None = None
-    trace: queue_service_pb2.TraceAction | None = None
+    trace: run_definition_pb2.TraceAction | None = None
     inputs_uri: str | None = None
     run_output_base: str | None = None
     realized_outputs_uri: str | None = None
@@ -198,12 +197,12 @@ class Action:
             realized_outputs_uri=outputs_uri,
             phase=run_definition_pb2.Phase.PHASE_SUCCEEDED,
             run_output_base=run_output_base,
-            trace=queue_service_pb2.TraceAction(
+            trace=run_definition_pb2.TraceAction(
                 name=friendly_name,
                 phase=run_definition_pb2.Phase.PHASE_SUCCEEDED,
                 start_time=st,
                 end_time=et,
-                outputs=run_definition_pb2.OutputReferences(
+                outputs=common_pb2.OutputReferences(
                     output_uri=outputs_uri,
                     report_uri=report_uri,
                 ),

flyte/_internal/controllers/remote/_client.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import grpc.aio
+from flyteidl2.workflow import queue_service_pb2_grpc, state_service_pb2_grpc
 
-from flyte._protos.workflow import queue_service_pb2_grpc, state_service_pb2_grpc
 from flyte.remote import create_channel
 
 from ._service_protocol import QueueService, StateService

flyte/_internal/controllers/remote/_controller.py

@@ -9,6 +9,9 @@ from collections.abc import Callable
 from pathlib import Path
 from typing import Any, Awaitable, DefaultDict, Tuple, TypeVar
 
+from flyteidl2.common import identifier_pb2
+from flyteidl2.workflow import run_definition_pb2
+
 import flyte
 import flyte.errors
 import flyte.storage as storage
@@ -22,8 +25,6 @@ from flyte._internal.runtime import convert, io
 from flyte._internal.runtime.task_serde import translate_task_to_wire
 from flyte._internal.runtime.types_serde import transform_native_to_typed_interface
 from flyte._logging import logger
-from flyte._protos.common import identifier_pb2
-from flyte._protos.workflow import run_definition_pb2
 from flyte._task import TaskTemplate
 from flyte._utils.helpers import _selector_policy
 from flyte.models import MAX_INLINE_IO_BYTES, ActionID, NativeInterface, SerializationContext
@@ -376,6 +377,7 @@ class RemoteController(Controller):
 
         func_name = _func.__name__
         invoke_seq_num = self.generate_task_call_sequence(_func, current_action_id)
+
         inputs = await convert.convert_from_native_to_inputs(_interface, *args, **kwargs)
         serialized_inputs = inputs.proto_inputs.SerializeToString(deterministic=True)
         inputs_hash = convert.generate_inputs_hash_from_proto(inputs.proto_inputs)

flyte/_internal/controllers/remote/_core.py

@@ -9,15 +9,13 @@ from typing import Awaitable, Coroutine, Optional
 
 import grpc.aio
 from aiolimiter import AsyncLimiter
+from flyteidl2.common import identifier_pb2
+from flyteidl2.task import task_definition_pb2
+from flyteidl2.workflow import queue_service_pb2, run_definition_pb2
 from google.protobuf.wrappers_pb2 import StringValue
 
 import flyte.errors
 from flyte._logging import log, logger
-from flyte._protos.common import identifier_pb2
-from flyte._protos.workflow import (
-    queue_service_pb2,
-    task_definition_pb2,
-)
 
 from ._action import Action
 from ._informer import InformerCache
@@ -303,11 +301,10 @@ class Controller:
             async with self._rate_limiter:
                 logger.info(f"Cancelling action: {action.name}")
                 try:
-                    # TODO add support when the queue service supports aborting actions
-                    # await self._queue_service.AbortQueuedAction(
-                    #     queue_service_pb2.AbortQueuedActionRequest(action_id=action.action_id),
-                    #     wait_for_ready=True,
-                    # )
+                    await self._queue_service.AbortQueuedAction(
+                        queue_service_pb2.AbortQueuedActionRequest(action_id=action.action_id),
+                        wait_for_ready=True,
+                    )
                     logger.info(f"Successfully cancelled action: {action.name}")
                 except grpc.aio.AioRpcError as e:
                     if e.code() in [
@@ -330,8 +327,8 @@ class Controller:
         """
         if not action.is_started():
             async with self._rate_limiter:
-                task: queue_service_pb2.TaskAction | None = None
-                trace: queue_service_pb2.TraceAction | None = None
+                task: run_definition_pb2.TaskAction | None = None
+                trace: run_definition_pb2.TraceAction | None = None
                 if action.type == "task":
                     if action.task is None:
                         raise flyte.errors.RuntimeSystemError(
@@ -342,7 +339,7 @@ class Controller:
                     if action.cache_key:
                         cache_key = StringValue(value=action.cache_key)
 
-                    task = queue_service_pb2.TaskAction(
+                    task = run_definition_pb2.TaskAction(
                         id=task_definition_pb2.TaskIdentifier(
                             version=action.task.task_template.id.version,
                             org=action.task.task_template.id.org,

flyte/_internal/controllers/remote/_informer.py

@@ -5,10 +5,10 @@ from asyncio import Queue
 from typing import AsyncIterator, Callable, Dict, Optional, Tuple, cast
 
 import grpc.aio
+from flyteidl2.common import identifier_pb2
+from flyteidl2.workflow import run_definition_pb2, state_service_pb2
 
 from flyte._logging import log, logger
-from flyte._protos.common import identifier_pb2
-from flyte._protos.workflow import run_definition_pb2, state_service_pb2
 
 from ._action import Action
 from ._service_protocol import StateService
@@ -373,7 +373,7 @@ class InformerCache:
         """Stop all informers and remove them from the cache"""
         async with self._lock:
             while self._cache:
-                name, informer = self._cache.popitem()
+                _name, informer = self._cache.popitem()
                 try:
                     await informer.stop()
                 except asyncio.CancelledError:

flyte/_internal/controllers/remote/_service_protocol.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import AsyncIterator, Protocol
 
-from flyte._protos.workflow import queue_service_pb2, state_service_pb2
+from flyteidl2.workflow import queue_service_pb2, state_service_pb2
 
 
 class StateService(Protocol):
@@ -28,12 +28,12 @@ class QueueService(Protocol):
     ) -> queue_service_pb2.EnqueueActionResponse:
         """Enqueue a task"""
 
-    # async def AbortQueuedAction(
-    #     self,
-    #     req: queue_service_pb2.AbortQueuedActionRequest,
-    #     **kwargs,
-    # ) -> queue_service_pb2.AbortQueuedActionResponse:
-    #     """Dequeue a task"""
+    async def AbortQueuedAction(
+        self,
+        req: queue_service_pb2.AbortQueuedActionRequest,
+        **kwargs,
+    ) -> queue_service_pb2.AbortQueuedActionResponse:
+        """Cancel an enqueued task"""
 
 
 class ClientSet(Protocol):

flyte/_internal/imagebuild/docker_builder.py

@@ -6,7 +6,7 @@ import tempfile
 import typing
 from pathlib import Path
 from string import Template
-from typing import ClassVar, List, Optional, Protocol, cast
+from typing import ClassVar, Optional, Protocol, cast
 
 import aiofiles
 import click
@@ -38,7 +38,7 @@ from flyte._internal.imagebuild.image_builder import (
     LocalDockerCommandImageChecker,
     LocalPodmanCommandImageChecker,
 )
-from flyte._internal.imagebuild.utils import copy_files_to_context
+from flyte._internal.imagebuild.utils import copy_files_to_context, get_and_list_dockerignore
 from flyte._logging import logger
 
 _F_IMG_ID = "_F_IMG_ID"
@@ -263,24 +263,35 @@ class AptPackagesHandler:
 
 class UVProjectHandler:
     @staticmethod
-    async def handle(layer: UVProject, context_path: Path, dockerfile: str) -> str:
+    async def handle(
+        layer: UVProject, context_path: Path, dockerfile: str, docker_ignore_patterns: list[str] = []
+    ) -> str:
         secret_mounts = _get_secret_mounts_layer(layer.secret_mounts)
-        if layer.extra_index_urls and "--no-install-project" in layer.extra_index_urls:
+        if layer.project_install_mode == "dependencies_only":
+            pip_install_args = " ".join(layer.get_pip_install_args())
+            if "--no-install-project" not in pip_install_args:
+                pip_install_args += " --no-install-project"
             # Only Copy pyproject.yaml and uv.lock.
             pyproject_dst = copy_files_to_context(layer.pyproject, context_path)
             uvlock_dst = copy_files_to_context(layer.uvlock, context_path)
             delta = UV_LOCK_WITHOUT_PROJECT_INSTALL_TEMPLATE.substitute(
                 UV_LOCK_PATH=uvlock_dst.relative_to(context_path),
                 PYPROJECT_PATH=pyproject_dst.relative_to(context_path),
-                PIP_INSTALL_ARGS=" ".join(layer.get_pip_install_args()),
+                PIP_INSTALL_ARGS=pip_install_args,
                 SECRET_MOUNT=secret_mounts,
             )
         else:
             # Copy the entire project.
-            pyproject_dst = copy_files_to_context(layer.pyproject.parent, context_path)
-            if layer.uvlock:
-                # Sometimes the uv.lock file is in a different folder, if it's specified, let's copy it there explicitly
+            pyproject_dst = copy_files_to_context(layer.pyproject.parent, context_path, docker_ignore_patterns)
+
+            # Make sure pyproject.toml and uv.lock files are not removed by docker ignore
+            uv_lock_context_path = pyproject_dst / "uv.lock"
+            pyproject_context_path = pyproject_dst / "pyproject.toml"
+            if not uv_lock_context_path.exists():
                 shutil.copy(layer.uvlock, pyproject_dst)
+            if not pyproject_context_path.exists():
+                shutil.copy(layer.pyproject, pyproject_dst)
+
             delta = UV_LOCK_INSTALL_TEMPLATE.substitute(
                 PYPROJECT_PATH=pyproject_dst.relative_to(context_path),
                 PIP_INSTALL_ARGS=" ".join(layer.get_pip_install_args()),
@@ -293,7 +304,9 @@ class UVProjectHandler:
 
 class PoetryProjectHandler:
     @staticmethod
-    async def handel(layer: PoetryProject, context_path: Path, dockerfile: str) -> str:
+    async def handel(
+        layer: PoetryProject, context_path: Path, dockerfile: str, docker_ignore_patterns: list[str] = []
+    ) -> str:
         secret_mounts = _get_secret_mounts_layer(layer.secret_mounts)
         if layer.extra_args and "--no-root" in layer.extra_args:
             # Only Copy pyproject.yaml and poetry.lock.
@@ -307,7 +320,16 @@ class PoetryProjectHandler:
             )
         else:
             # Copy the entire project.
-            pyproject_dst = copy_files_to_context(layer.pyproject.parent, context_path)
+            pyproject_dst = copy_files_to_context(layer.pyproject.parent, context_path, docker_ignore_patterns)
+
+            # Make sure pyproject.toml and poetry.lock files are not removed by docker ignore
+            poetry_lock_context_path = pyproject_dst / "poetry.lock"
+            pyproject_context_path = pyproject_dst / "pyproject.toml"
+            if not poetry_lock_context_path.exists():
+                shutil.copy(layer.poetry_lock, pyproject_dst)
+            if not pyproject_context_path.exists():
+                shutil.copy(layer.pyproject, pyproject_dst)
+
             delta = POETRY_LOCK_INSTALL_TEMPLATE.substitute(
                 PYPROJECT_PATH=pyproject_dst.relative_to(context_path),
                 POETRY_INSTALL_ARGS=layer.extra_args or "",
@@ -324,37 +346,9 @@ class DockerIgnoreHandler:
 
 
 class CopyConfigHandler:
-    @staticmethod
-    def list_dockerignore(root_path: Optional[Path], docker_ignore_file_path: Optional[Path]) -> List[str]:
-        patterns: List[str] = []
-        dockerignore_path: Optional[Path] = None
-        if root_path:
-            dockerignore_path = root_path / ".dockerignore"
-        # DockerIgnore layer should be first priority
-        if docker_ignore_file_path:
-            dockerignore_path = docker_ignore_file_path
-
-        # Return empty list if no .dockerignore file found
-        if not dockerignore_path or not dockerignore_path.exists() or not dockerignore_path.is_file():
-            logger.info(f".dockerignore file not found at path: {dockerignore_path}")
-            return patterns
-
-        try:
-            with open(dockerignore_path, "r", encoding="utf-8") as f:
-                for line in f:
-                    stripped_line = line.strip()
-                    # Skip empty lines, whitespace-only lines, and comments
-                    if not stripped_line or stripped_line.startswith("#"):
-                        continue
-                    patterns.append(stripped_line)
-        except Exception as e:
-            logger.error(f"Failed to read .dockerignore file at {dockerignore_path}: {e}")
-            return []
-        return patterns
-
     @staticmethod
     async def handle(
-        layer: CopyConfig, context_path: Path, dockerfile: str, docker_ignore_file_path: Optional[Path]
+        layer: CopyConfig, context_path: Path, dockerfile: str, docker_ignore_patterns: list[str] = []
     ) -> str:
         # Copy the source config file or directory to the context path
         if layer.src.is_absolute() or ".." in str(layer.src):
@@ -370,11 +364,6 @@ class CopyConfigHandler:
             shutil.copy(abs_path, dst_path)
         elif layer.src.is_dir():
             # Copy the entire directory
-            from flyte._initialize import _get_init_config
-
-            init_config = _get_init_config()
-            root_path = init_config.root_dir if init_config else None
-            docker_ignore_patterns = CopyConfigHandler.list_dockerignore(root_path, docker_ignore_file_path)
             shutil.copytree(
                 abs_path, dst_path, dirs_exist_ok=True, ignore=shutil.ignore_patterns(*docker_ignore_patterns)
             )
@@ -450,7 +439,7 @@ def _get_secret_mounts_layer(secrets: typing.Tuple[str | Secret, ...] | None) ->
 
 
 async def _process_layer(
-    layer: Layer, context_path: Path, dockerfile: str, docker_ignore_file_path: Optional[Path]
+    layer: Layer, context_path: Path, dockerfile: str, docker_ignore_patterns: list[str] = []
 ) -> str:
     match layer:
         case PythonWheels():
@@ -483,15 +472,19 @@ async def _process_layer(
 
         case UVProject():
             # Handle UV project
-            dockerfile = await UVProjectHandler.handle(layer, context_path, dockerfile)
+            dockerfile = await UVProjectHandler.handle(layer, context_path, dockerfile, docker_ignore_patterns)
 
         case PoetryProject():
             # Handle Poetry project
-            dockerfile = await PoetryProjectHandler.handel(layer, context_path, dockerfile)
+            dockerfile = await PoetryProjectHandler.handel(layer, context_path, dockerfile, docker_ignore_patterns)
+
+        case PoetryProject():
+            # Handle Poetry project
+            dockerfile = await PoetryProjectHandler.handel(layer, context_path, dockerfile, docker_ignore_patterns)
 
         case CopyConfig():
             # Handle local files and folders
-            dockerfile = await CopyConfigHandler.handle(layer, context_path, dockerfile, docker_ignore_file_path)
+            dockerfile = await CopyConfigHandler.handle(layer, context_path, dockerfile, docker_ignore_patterns)
 
         case Commands():
             # Handle commands
@@ -618,15 +611,6 @@ class DockerImageBuilder(ImageBuilder):
         else:
             logger.info("Buildx builder already exists.")
 
-    def get_docker_ignore(self, image: Image) -> Optional[Path]:
-        """Get the .dockerignore file path from the image layers."""
-        # Look for DockerIgnore layer in the image layers
-        for layer in image._layers:
-            if isinstance(layer, DockerIgnore) and layer.path.strip():
-                return Path(layer.path)
-
-        return None
-
     async def _build_image(self, image: Image, *, push: bool = True, dry_run: bool = False) -> str:
         """
         if default image (only base image and locked), raise an error, don't have a dockerfile
@@ -657,9 +641,11 @@ class DockerImageBuilder(ImageBuilder):
                 PYTHON_VERSION=f"{image.python_version[0]}.{image.python_version[1]}",
             )
 
-            docker_ignore_file_path = self.get_docker_ignore(image)
+            # Get .dockerignore file patterns first
+            docker_ignore_patterns = get_and_list_dockerignore(image)
+
             for layer in image._layers:
-                dockerfile = await _process_layer(layer, tmp_path, dockerfile, docker_ignore_file_path)
+                dockerfile = await _process_layer(layer, tmp_path, dockerfile, docker_ignore_patterns)
 
             dockerfile += DOCKER_FILE_BASE_FOOTER.substitute(F_IMG_ID=image.uri)