shipit-cli 0.13.4__py3-none-any.whl → 0.15.0__py3-none-any.whl

shipit/cli.py

@@ -1,47 +1,40 @@
 import tempfile
-import hashlib
-import requests
 import os
-import shlex
-import shutil
 import sys
 import json
-import yaml
-import base64
-from dataclasses import dataclass
 from pathlib import Path
-from typing import (
-    Any,
-    Dict,
-    List,
-    Optional,
-    Protocol,
-    Set,
-    Tuple,
-    TypedDict,
-    Union,
-    Literal,
-    cast,
-)
-from shutil import copy, copytree, ignore_patterns
+from dataclasses import dataclass
+from typing import Any, Dict, List, Optional, Tuple, cast, Literal
 
-import sh  # type: ignore[import-untyped]
-import starlark as sl
+import xingque as sl
 import typer
 from rich import box
-from rich.console import Console
 from rich.panel import Panel
-from rich.rule import Rule
 from rich.syntax import Syntax
 
-from shipit.version import version as shipit_version
-from shipit.generator import generate_shipit, detect_provider
-from shipit.providers.base import CustomCommands
-from shipit.procfile import Procfile
+from shipit.generator import generate_shipit, load_provider, load_provider_config
+from shipit.providers.base import Config
 from dotenv import dotenv_values
-
-
-console = Console()
+from shipit.builders import BuildBackend, DockerBuildBackend, LocalBuildBackend
+from shipit.runners import Runner, LocalRunner, WasmerRunner
+from shipit.shipit_types import (
+    Build,
+    CopyStep,
+    EnvStep,
+    Mount,
+    Package,
+    PathStep,
+    PrepareStep,
+    RunStep,
+    Serve,
+    Service,
+    Step,
+    UseStep,
+    Volume,
+    WorkdirStep,
+)
+from shipit.ui import console
+from shipit.version import version as shipit_version
 
 app = typer.Typer(invoke_without_command=True)
 
@@ -50,1157 +43,16 @@ ASSETS_PATH = DIR_PATH / "assets"
 
 
 @dataclass
-class Mount:
-    name: str
-    build_path: Path
-    serve_path: Path
-
-
-@dataclass
-class Volume:
-    name: str
-    serve_path: Path
-
-
-@dataclass
-class Service:
-    name: str
-    provider: Literal[
-        "postgres", "mysql", "redis"
-    ]  # Right now we only support postgres and mysql
-
-
-@dataclass
-class Serve:
-    name: str
-    provider: str
-    build: List["Step"]
-    deps: List["Package"]
-    commands: Dict[str, str]
-    cwd: Optional[str] = None
-    prepare: Optional[List["PrepareStep"]] = None
-    workers: Optional[List[str]] = None
-    mounts: Optional[List[Mount]] = None
-    volumes: Optional[List[Volume]] = None
-    env: Optional[Dict[str, str]] = None
-    services: Optional[List[Service]] = None
-
-
-@dataclass
-class Package:
-    name: str
-    version: Optional[str] = None
-    architecture: Optional[Literal["64-bit", "32-bit"]] = None
-
-    def __str__(self) -> str:  # pragma: no cover - simple representation
-        name = f"{self.name}({self.architecture})" if self.architecture else self.name
-        if self.version is None:
-            return name
-        return f"{name}@{self.version}"
-
-
-@dataclass
-class RunStep:
-    command: str
-    inputs: Optional[List[str]] = None
-    outputs: Optional[List[str]] = None
-    group: Optional[str] = None
-
-
-@dataclass
-class WorkdirStep:
-    path: Path
-
-
-@dataclass
-class CopyStep:
-    source: str
-    target: str
-    ignore: Optional[List[str]] = None
-    # We can copy from the app source or from the shipit assets folder
-    base: Literal["source", "assets"] = "source"
-
-    def is_download(self) -> bool:
-        return self.source.startswith("http://") or self.source.startswith("https://")
-
-
-@dataclass
-class EnvStep:
-    variables: Dict[str, str]
-
-    def __str__(self) -> str:  # pragma: no cover - simple representation
-        return " ".join([f"{key}={value}" for key, value in self.variables.items()])
-
-
-@dataclass
-class UseStep:
-    dependencies: List[Package]
-
-
-@dataclass
-class PathStep:
+class CtxMount:
+    ref: str
     path: str
-
-
-Step = Union[RunStep, CopyStep, EnvStep, PathStep, UseStep, WorkdirStep]
-PrepareStep = Union[RunStep]
-
-
-@dataclass
-class Build:
-    deps: List[Package]
-    steps: List[Step]
-
-
-def write_stdout(line: str) -> None:
-    sys.stdout.write(line)  # print to console
-    sys.stdout.flush()
-
-
-def write_stderr(line: str) -> None:
-    sys.stderr.write(line)  # print to console
-    sys.stderr.flush()
-
-
-class MapperItem(TypedDict):
-    dependencies: Dict[str, str]
-    scripts: Set[str]
-    env: Dict[str, str]
-    aliases: Dict[str, str]
-
-
-class Builder(Protocol):
-    def build(
-        self, env: Dict[str, str], mounts: List[Mount], steps: List[Step]
-    ) -> None: ...
-    def build_prepare(self, serve: Serve) -> None: ...
-    def build_serve(self, serve: Serve) -> None: ...
-    def finalize_build(self, serve: Serve) -> None: ...
-    def prepare(self, env: Dict[str, str], prepare: List[PrepareStep]) -> None: ...
-    def getenv(self, name: str) -> Optional[str]: ...
-    def run_serve_command(self, command: str) -> None: ...
-    def run_command(
-        self, command: str, extra_args: Optional[List[str]] | None = None
-    ) -> Any: ...
-    def get_build_mount_path(self, name: str) -> Path: ...
-    def get_serve_mount_path(self, name: str) -> Path: ...
-
-
-class DockerBuilder:
-    mise_mapper = {
-        "php": {
-            "source": "ubi:adwinying/php",
-        },
-        "composer": {
-            "source": "ubi:composer/composer",
-            "postinstall": """composer_dir=$(mise where ubi:composer/composer); ln -s "$composer_dir/composer.phar" /usr/local/bin/composer""",
-        },
-    }
-
-    def __init__(self, src_dir: Path, docker_client: Optional[str] = None) -> None:
-        self.src_dir = src_dir
-        self.docker_file_contents = ""
-        self.docker_path = self.src_dir / ".shipit" / "docker"
-        self.docker_out_path = self.docker_path / "out"
-        self.depot_metadata = self.docker_path / "depot-build.json"
-        self.docker_file_path = self.docker_path / "Dockerfile"
-        self.docker_name_path = self.docker_path / "name"
-        self.docker_ignore_path = self.docker_path / "Dockerfile.dockerignore"
-        self.shipit_docker_path = Path("/shipit")
-        self.docker_client = docker_client or "docker"
-        self.env = {
-            "HOME": "/root",
-        }
-
-    def get_mount_path(self, name: str) -> Path:
-        if name == "app":
-            return Path("app")
-        else:
-            return Path("opt") / name
-
-    def get_build_mount_path(self, name: str) -> Path:
-        path = Path("/") / self.get_mount_path(name)
-        return path
-
-    def get_serve_mount_path(self, name: str) -> Path:
-        return self.docker_out_path / self.get_mount_path(name)
-
-    @property
-    def is_depot(self) -> bool:
-        return self.docker_client == "depot"
-
-    def getenv(self, name: str) -> Optional[str]:
-        return self.env.get(name) or os.environ.get(name)
-
-    def mkdir(self, path: Path) -> Path:
-        path = self.shipit_docker_path / path
-        self.docker_file_contents += f"RUN mkdir -p {str(path.absolute())}\n"
-        return path.absolute()
-
-    def build_dockerfile(self, image_name: str) -> None:
-        self.docker_file_path.write_text(self.docker_file_contents)
-        self.docker_name_path.write_text(image_name)
-        self.print_dockerfile()
-        extra_args = []
-        # if self.is_depot:
-        #     # We load the docker image back into the local docker daemon
-        #     # extra_args += ["--load"]
-        #     extra_args += ["--save", f"--metadata-file={self.depot_metadata.absolute()}"]
-        sh.Command(self.docker_client)(
-            "build",
-            "-f",
-            (self.docker_path / "Dockerfile").absolute(),
-            "-t",
-            image_name,
-            "--platform",
-            "linux/amd64",
-            "--output",
-            self.docker_out_path.absolute(),
-            ".",
-            *extra_args,
-            _cwd=self.src_dir.absolute(),
-            _env=os.environ,  # Pass the current environment variables to the Docker client
-            _out=write_stdout,
-            _err=write_stderr,
-        )
-        # if self.is_depot:
-        #     json_text = self.depot_metadata.read_text()
-        #     json_data = json.loads(json_text)
-        #     build_data = json_data["depot.build"]
-        #     image_id = build_data["buildID"]
-        #     project = build_data["projectID"]
-        #     sh.Command("depot")(
-        #         "pull",
-        #         "--platform",
-        #         "linux/amd64",
-        #         "--project",
-        #         project,
-        #         image_id,
-        #         _cwd=self.src_dir.absolute(),
-        #         _env=os.environ,  # Pass the current environment variables to the Docker client
-        #         _out=write_stdout,
-        #         _err=write_stderr,
-        #     )
-        #     # console.print(f"[bold]Image ID:[/bold] {image_id}")
-
-    def finalize_build(self, serve: Serve) -> None:
-        console.print(f"\n[bold]Building Docker file[/bold]")
-        self.build_dockerfile(serve.name)
-        console.print(Rule(characters="-", style="bright_black"))
-        console.print(f"[bold]Build complete ✅[/bold]")
-
-    def run_command(self, command: str, extra_args: Optional[List[str]] = None) -> Any:
-        image_name = self.docker_name_path.read_text()
-        docker_args: List[str] = [
-            "run",
-            "-p",
-            "80:80",
-            "--rm",
-        ]
-        # Attach volumes if present
-        # if serve.volumes:
-        #     for vol in serve.volumes:
-        #         docker_args += [
-        #             "--mount",
-        #             f"type=volume,source={vol.name},target={str(vol.serve_path)}",
-        #         ]
-        return sh.Command("docker")(
-            *docker_args,
-            image_name,
-            command,
-            *(extra_args or []),
-            _env={
-                "DOCKER_BUILDKIT": "1",
-                **os.environ,
-            },  # Pass the current environment variables to the Docker client
-            _out=write_stdout,
-            _err=write_stderr,
-        )
-
-    def create_file(self, path: Path, content: str, mode: int = 0o755) -> Path:
-        # docker_files = self.docker_path / "files" / path.name
-        # docker_files.write_text(content)
-        # docker_files.chmod(mode)
-        self.docker_file_contents += f"""
-RUN cat > {path.absolute()} <<'EOF'
-{content}
-EOF
-
-RUN chmod {oct(mode)[2:]} {path.absolute()}
-"""
-
-        return path.absolute()
-
-    def print_dockerfile(self) -> None:
-        docker_file = self.docker_path / "Dockerfile"
-        manifest_panel = Panel(
-            Syntax(
-                docker_file.read_text(),
-                "dockerfile",
-                theme="monokai",
-                background_color="default",
-                line_numbers=True,
-            ),
-            box=box.SQUARE,
-            border_style="bright_black",
-            expand=False,
-        )
-        console.print(manifest_panel, markup=False, highlight=True)
-
-    def add_dependency(self, dependency: Package):
-        if dependency.name == "pie":
-            self.docker_file_contents += f"RUN apt-get update && apt-get -y --no-install-recommends install gcc make autoconf libtool bison re2c pkg-config libpq-dev\n"
-            self.docker_file_contents += f"RUN curl -L --output /usr/bin/pie https://github.com/php/pie/releases/download/1.2.0/pie.phar && chmod +x /usr/bin/pie\n"
-            return
-        elif dependency.name == "static-web-server":
-            if dependency.version:
-                self.docker_file_contents += (
-                    f"ENV SWS_INSTALL_VERSION={dependency.version}\n"
-                )
-            self.docker_file_contents += f"RUN curl --proto '=https' --tlsv1.2 -sSfL https://get.static-web-server.net | sh\n"
-            return
-
-        mapped_dependency = self.mise_mapper.get(dependency.name, {})
-        package_name = mapped_dependency.get("source", dependency.name)
-        if dependency.version:
-            self.docker_file_contents += (
-                f"RUN mise use --global {package_name}@{dependency.version}\n"
-            )
-        else:
-            self.docker_file_contents += f"RUN mise use --global {package_name}\n"
-        if mapped_dependency.get("postinstall"):
-            self.docker_file_contents += f"RUN {mapped_dependency.get('postinstall')}\n"
-
-    def build(
-        self, env: Dict[str, str], mounts: List[Mount], steps: List[Step]
-    ) -> None:
-        base_path = self.docker_path
-        shutil.rmtree(base_path, ignore_errors=True)
-        base_path.mkdir(parents=True, exist_ok=True)
-        self.docker_file_contents = "# syntax=docker/dockerfile:1.7-labs\n"
-        self.docker_file_contents += "FROM debian:trixie-slim AS build\n"
-
-        self.docker_file_contents += """
-RUN apt-get update \\
-    && apt-get -y --no-install-recommends install \\
-        build-essential gcc make autoconf libtool bison \\
-        dpkg-dev pkg-config re2c locate \\
-        libmariadb-dev libmariadb-dev-compat libpq-dev \\
-        libvips-dev default-libmysqlclient-dev libmagickwand-dev \\
-        libicu-dev libxml2-dev libxslt-dev \\
-        sudo curl ca-certificates \\
-    && rm -rf /var/lib/apt/lists/*
-
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-ENV MISE_DATA_DIR="/mise"
-ENV MISE_CONFIG_DIR="/mise"
-ENV MISE_CACHE_DIR="/mise/cache"
-ENV MISE_INSTALL_PATH="/usr/local/bin/mise"
-ENV PATH="/mise/shims:$PATH"
-# ENV MISE_VERSION="..."
-
-RUN curl https://mise.run | sh
-"""
-        # docker_file_contents += "RUN curl https://mise.run | sh\n"
-        #         self.docker_file_contents += """
-        # RUN curl https://get.wasmer.io -sSfL | sh -s "v6.1.0-rc.3"
-        # ENV PATH="/root/.wasmer/bin:${PATH}"
-        # """
-        for mount in mounts:
-            self.docker_file_contents += f"RUN mkdir -p {mount.build_path.absolute()}\n"
-
-        for step in steps:
-            if isinstance(step, WorkdirStep):
-                self.docker_file_contents += f"WORKDIR {step.path.absolute()}\n"
-            elif isinstance(step, RunStep):
-                if step.inputs:
-                    pre = "\\\n  " + "".join(
-                        [
-                            f"--mount=type=bind,source={input},target={input} \\\n  "
-                            for input in step.inputs
-                        ]
-                    )
-                else:
-                    pre = ""
-                self.docker_file_contents += f"RUN {pre}{step.command}\n"
-            elif isinstance(step, CopyStep):
-                if step.is_download():
-                    self.docker_file_contents += (
-                        "ADD " + step.source + " " + step.target + "\n"
-                    )
-                elif step.base == "assets":
-                    # Detect if the asset exists and is a file
-                    if (ASSETS_PATH / step.source).is_file():
-                        # Read the file content and write it to the target file
-                        content_base64 = base64.b64encode(
-                            (ASSETS_PATH / step.source).read_bytes()
-                        ).decode("utf-8")
-                        self.docker_file_contents += (
-                            f"RUN echo '{content_base64}' | base64 -d > {step.target}\n"
-                        )
-                    elif (ASSETS_PATH / step.source).is_dir():
-                        raise Exception(
-                            f"Asset {step.source} is a directory, shipit doesn't currently support coppying assets directories inside Docker"
-                        )
-                    else:
-                        raise Exception(f"Asset {step.source} does not exist")
-                else:
-                    if step.ignore:
-                        exclude = (
-                            " \\\n"
-                            + " \\\n".join(
-                                [f"  --exclude={ignore}" for ignore in step.ignore]
-                            )
-                            + " \\\n "
-                        )
-                    else:
-                        exclude = ""
-                    self.docker_file_contents += (
-                        f"COPY{exclude} {step.source} {step.target}\n"
-                    )
-            elif isinstance(step, EnvStep):
-                env_vars = " ".join(
-                    [f"{key}={value}" for key, value in step.variables.items()]
-                )
-                self.docker_file_contents += f"ENV {env_vars}\n"
-            elif isinstance(step, PathStep):
-                self.docker_file_contents += f"ENV PATH={step.path}:$PATH\n"
-            elif isinstance(step, UseStep):
-                for dependency in step.dependencies:
-                    self.add_dependency(dependency)
-
-        self.docker_file_contents += """
-FROM scratch
-"""
-        for mount in mounts:
-            self.docker_file_contents += (
-                f"COPY --from=build {mount.build_path} {mount.build_path}\n"
-            )
-
-        self.docker_ignore_path.write_text("""
-.shipit
-Shipit
-""")
-
-    def get_path(self) -> Path:
-        return Path("/")
-
-    def prepare(self, env: Dict[str, str], prepare: List[PrepareStep]) -> None:
-        raise NotImplementedError
-
-    def build_serve(self, serve: Serve) -> None:
-        serve_command_path = self.mkdir(Path("serve") / "bin")
-        console.print(f"[bold]Serve Commands:[/bold]")
-        for dep in serve.deps:
-            self.add_dependency(dep)
-
-        for command in serve.commands:
-            console.print(f"* {command}")
-            command_path = serve_command_path / command
-            self.create_file(
-                command_path,
-                f"#!/bin/bash\ncd {serve.cwd}\n{serve.commands[command]}",
-                mode=0o755,
-            )
-
-    def run_serve_command(self, command: str) -> None:
-        path = self.shipit_docker_path / "serve" / "bin" / command
-        self.run_command(str(path))
-
-
-class LocalBuilder:
-    def __init__(self, src_dir: Path) -> None:
-        self.src_dir = src_dir
-        self.local_path = self.src_dir / ".shipit" / "local"
-        self.serve_bin_path = self.local_path / "serve" / "bin"
-        self.prepare_bash_script = self.local_path / "prepare" / "prepare.sh"
-        self.build_path = self.local_path / "build"
-        self.workdir = self.build_path
-
-    def get_mount_path(self, name: str) -> Path:
-        if name == "app":
-            return self.build_path / "app"
-        else:
-            return self.build_path / "opt" / name
-
-    def get_build_mount_path(self, name: str) -> Path:
-        return self.get_mount_path(name)
-
-    def get_serve_mount_path(self, name: str) -> Path:
-        return self.get_mount_path(name)
-
-    def execute_step(self, step: Step, env: Dict[str, str]) -> None:
-        build_path = self.workdir
-        if isinstance(step, UseStep):
-            console.print(
-                f"[bold]Using dependencies:[/bold] {', '.join([str(dep) for dep in step.dependencies])}"
-            )
-        elif isinstance(step, WorkdirStep):
-            console.print(f"[bold]Working in {step.path}[/bold]")
-            self.workdir = step.path
-            # We make sure the dir exists
-            step.path.mkdir(parents=True, exist_ok=True)
-        elif isinstance(step, RunStep):
-            extra = ""
-            if step.inputs:
-                for input in step.inputs:
-                    print(f"Copying {input} to {build_path / input}")
-                    copy((self.src_dir / input), (build_path / input))
-                all_inputs = ", ".join(step.inputs)
-                extra = f" [bright_black]# using {all_inputs}[/bright_black]"
-            console.print(
-                f"[bright_black]$[/bright_black] [bold]{step.command}[/bold]{extra}"
-            )
-            command_line = step.command
-            parts = shlex.split(command_line)
-            program = parts[0]
-            extended_paths = [
-                str(build_path / path) for path in env["PATH"].split(os.pathsep)
-            ]
-            extended_paths.append(os.environ["PATH"])
-            PATH = os.pathsep.join(extended_paths)  # type: ignore
-            exe = shutil.which(program, path=PATH)
-            if not exe:
-                raise Exception(f"Program is not installed: {program}")
-            cmd = sh.Command("bash")  # "grep"
-            result = cmd(
-                "-c",
-                command_line,
-                _env={**env, "PATH": PATH},
-                _cwd=build_path,
-                _out=write_stdout,
-                _err=write_stderr,
-            )
-        elif isinstance(step, CopyStep):
-            ignore_extra = ""
-            if step.ignore:
-                ignore_extra = (
-                    f" [bright_black]# ignoring {', '.join(step.ignore)}[/bright_black]"
-                )
-            ignore_matches = step.ignore if step.ignore else []
-            ignore_matches.append(".shipit")
-            ignore_matches.append("Shipit")
-
-            if step.is_download():
-                console.print(
-                    f"[bold]Download from {step.source} to {step.target}[/bold]"
-                )
-                download_file(step.source, (build_path / step.target))
-            else:
-                if step.base == "source":
-                    base = self.src_dir
-                elif step.base == "assets":
-                    base = ASSETS_PATH
-                else:
-                    raise Exception(f"Unknown base: {step.base}")
-
-                console.print(
-                    f"[bold]Copy to {step.target} from {step.source}[/bold]{ignore_extra}"
-                )
-
-                if (base / step.source).is_dir():
-                    copytree(
-                        (base / step.source),
-                        (build_path / step.target),
-                        dirs_exist_ok=True,
-                        ignore=ignore_patterns(*ignore_matches),
-                    )
-                elif (base / step.source).is_file():
-                    copy(
-                        (base / step.source),
-                        (build_path / step.target),
-                    )
-                else:
-                    raise Exception(f"Source {step.source} is not a file or directory")
-        elif isinstance(step, EnvStep):
-            print(f"Setting environment variables: {step}")
-            env.update(step.variables)
-        elif isinstance(step, PathStep):
-            console.print(f"[bold]Add {step.path}[/bold] to PATH")
-            fullpath = step.path
-            env["PATH"] = f"{fullpath}{os.pathsep}{env['PATH']}"
-        else:
-            raise Exception(f"Unknown step type: {type(step)}")
-
-    def build(
-        self, env: Dict[str, str], mounts: List[Mount], steps: List[Step]
-    ) -> None:
-        console.print(f"\n[bold]Building... 🚀[/bold]")
-        base_path = self.local_path
-        shutil.rmtree(base_path, ignore_errors=True)
-        base_path.mkdir(parents=True, exist_ok=True)
-        self.build_path.mkdir(exist_ok=True)
-        for mount in mounts:
-            mount.build_path.mkdir(parents=True, exist_ok=True)
-        for step in steps:
-            console.print(Rule(characters="-", style="bright_black"))
-            self.execute_step(step, env)
-
-        if "PATH" in env:
-            path = base_path / ".path"
-            path.write_text(env["PATH"])  # type: ignore
-
-        console.print(Rule(characters="-", style="bright_black"))
-        console.print(f"[bold]Build complete ✅[/bold]")
-
-    def mkdir(self, path: Path) -> Path:
-        path = self.get_path() / path
-        path.mkdir(parents=True, exist_ok=True)
-        return path.absolute()
-
-    def create_file(self, path: Path, content: str, mode: int = 0o755) -> Path:
-        path.write_text(content)
-        path.chmod(mode)
-        return path.absolute()
-
-    def run_command(self, command: str, extra_args: Optional[List[str]] = None) -> Any:
-        return sh.Command(command)(
-            *(extra_args or []),
-            _out=write_stdout,
-            _err=write_stderr,
-            _env=os.environ,
-        )
-
-    def getenv(self, name: str) -> Optional[str]:
-        return os.environ.get(name)
-
-    def get_path(self) -> Path:
-        return self.local_path
-
-    def build_prepare(self, serve: Serve) -> None:
-        self.prepare_bash_script.parent.mkdir(parents=True, exist_ok=True)
-        commands: List[str] = []
-        if serve.cwd:
-            commands.append(f"cd {serve.cwd}")
-        if serve.prepare:
-            for step in serve.prepare:
-                if isinstance(step, RunStep):
-                    commands.append(step.command)
-                elif isinstance(step, WorkdirStep):
-                    commands.append(f"cd {step.path}")
-        content = "#!/bin/bash\n{body}".format(body="\n".join(commands))
-        console.print(
-            f"\n[bold]Created prepare.sh script to run before packaging ✅[/bold]"
-        )
-        manifest_panel = Panel(
-            Syntax(
-                content,
-                "bash",
-                theme="monokai",
-                background_color="default",
-                line_numbers=True,
-            ),
-            box=box.SQUARE,
-            border_style="bright_black",
-            expand=False,
-        )
-        console.print(manifest_panel, markup=False, highlight=True)
-        self.prepare_bash_script.write_text(content)
-        self.prepare_bash_script.chmod(0o755)
-
-    def finalize_build(self, serve: Serve) -> None:
-        pass
-
-    def prepare(self, env: Dict[str, str], prepare: List[PrepareStep]) -> None:
-        sh.Command(f"{self.prepare_bash_script.absolute()}")(
-            _out=write_stdout, _err=write_stderr
-        )
-
-    def build_serve(self, serve: Serve) -> None:
-        # Remember serve configuration for run-time
-        console.print("\n[bold]Building serve[/bold]")
-        self.serve_bin_path.mkdir(parents=True, exist_ok=False)
-        path = self.get_path() / ".path"
-        path_text = path.read_text()
-        console.print(f"[bold]Serve Commands:[/bold]")
-        for command in serve.commands:
-            console.print(f"* {command}")
-            command_path = self.serve_bin_path / command
-            env_vars = ""
-            if serve.env:
-                env_vars = " ".join([f"{k}={v}" for k, v in serve.env.items()])
-
-            content = f"#!/bin/bash\ncd {serve.cwd}\nPATH={path_text}:$PATH {env_vars} {serve.commands[command]}"
-            command_path.write_text(content)
-            manifest_panel = Panel(
-                Syntax(
-                    content.strip(),
-                    "bash",
-                    theme="monokai",
-                    background_color="default",
-                    line_numbers=True,
-                ),
-                box=box.SQUARE,
-                border_style="bright_black",
-                expand=False,
-            )
-            console.print(manifest_panel, markup=False, highlight=True)
-            command_path.chmod(0o755)
-
-    def run_serve_command(self, command: str) -> None:
-        console.print(f"\n[bold]Running {command} command[/bold]")
-        command_path = self.serve_bin_path / command
-        sh.Command(str(command_path))(_out=write_stdout, _err=write_stderr)
-
-
-class WasmerBuilder:
-    def get_build_mount_path(self, name: str) -> Path:
-        return self.inner_builder.get_build_mount_path(name)
-
-    def get_serve_mount_path(self, name: str) -> Path:
-        if name == "app":
-            return Path("/app")
-        else:
-            return Path("/opt") / name
-
-    mapper: Dict[str, MapperItem] = {
-        "python": {
-            "dependencies": {
-                "latest": "python/python@=3.13.1",
-                "3.13": "python/python@=3.13.1",
-            },
-            "scripts": {"python"},
-            "aliases": {},
-            "env": {
-                "PYTHONEXECUTABLE": "/bin/python",
-                "PYTHONHOME": "/cpython",
-            },
-        },
-        "pandoc": {
-            "dependencies": {
-                "latest": "wasmer/pandoc@=0.0.1",
-                "3.5": "wasmer/pandoc@=0.0.1",
-            },
-            "scripts": {"pandoc"},
-        },
-        "ffmpeg": {
-            "dependencies": {
-                "latest": "wasmer/ffmpeg@=1.0.5",
-                "N-111519": "wasmer/ffmpeg@=1.0.5",
-            },
-            "scripts": {"ffmpeg"},
-        },
-        "php": {
-            "dependencies": {
-                "latest": "php/php-32@=8.3.2102",
-                "8.3": "php/php-32@=8.3.2102",
-                "8.2": "php/php-32@=8.2.2801",
-                "8.1": "php/php-32@=8.1.3201",
-                "7.4": "php/php-32@=7.4.3301",
-            },
-            "architecture_dependencies": {
-                "64-bit": {
-                    "latest": "php/php-64@=8.3.2102",
-                    "8.3": "php/php-64@=8.3.2102",
-                    "8.2": "php/php-64@=8.2.2801",
-                    "8.1": "php/php-64@=8.1.3201",
-                    "7.4": "php/php-64@=7.4.3301",
-                },
-                "32-bit": {
-                    "latest": "php/php-32@=8.3.2102",
-                    "8.3": "php/php-32@=8.3.2102",
-                    "8.2": "php/php-32@=8.2.2801",
-                    "8.1": "php/php-32@=8.1.3201",
-                    "7.4": "php/php-32@=7.4.3301",
-                },
-            },
-            "scripts": {"php"},
-            "aliases": {},
-            "env": {},
-        },
-        "bash": {
-            "dependencies": {
-                "latest": "wasmer/bash@=1.0.24",
-                "8.3": "wasmer/bash@=1.0.24",
-            },
-            "scripts": {"bash", "sh"},
-            "aliases": {},
-            "env": {},
-        },
-        "static-web-server": {
-            "dependencies": {
-                "latest": "wasmer/static-web-server@=1.1.0",
-                "2.38.0": "wasmer/static-web-server@=1.1.0",
-                "0.1": "wasmer/static-web-server@=1.1.0",
-            },
-            "scripts": {"webserver"},
-            "aliases": {"static-web-server": "webserver"},
-            "env": {},
-        },
-    }
-
-    def __init__(
-        self,
-        inner_builder: Builder,
-        src_dir: Path,
-        registry: Optional[str] = None,
-        token: Optional[str] = None,
-        bin: Optional[str] = None,
-    ) -> None:
-        self.src_dir = src_dir
-        self.inner_builder = inner_builder
-        # The path where we store the directory of the wasmer app in the inner builder
-        self.wasmer_dir_path = self.src_dir / ".shipit" / "wasmer"
-        self.wasmer_registry = registry
-        self.wasmer_token = token
-        self.bin = bin or "wasmer"
-        self.default_env = {
-            "SHIPIT_PYTHON_EXTRA_INDEX_URL": "https://pythonindex.wasix.org/simple",
-            "SHIPIT_PYTHON_CROSS_PLATFORM": "wasix_wasm32",
-            "SHIPIT_PYTHON_PRECOMPILE": "true",
-        }
-
-    def getenv(self, name: str) -> Optional[str]:
-        return self.inner_builder.getenv(name) or self.default_env.get(name)
-
-    def build(
-        self, env: Dict[str, str], mounts: List[Mount], build: List[Step]
-    ) -> None:
-        return self.inner_builder.build(env, mounts, build)
-
-    def build_prepare(self, serve: Serve) -> None:
-        print("Building prepare")
-        prepare_dir = self.wasmer_dir_path / "prepare"
-        prepare_dir.mkdir(parents=True, exist_ok=True)
-        env = serve.env or {}
-        for dep in serve.deps:
-            if dep.name in self.mapper:
-                dep_env = self.mapper[dep.name].get("env")
-                if dep_env is not None:
-                    env.update(dep_env)
-        if env:
-            env_lines = [f"export {k}={v}" for k, v in env.items()]
-            env_lines = "\n".join(env_lines)
-        else:
-            env_lines = ""
-
-        commands: List[str] = []
-        if serve.cwd:
-            commands.append(f"cd {serve.cwd}")
-
-        if serve.prepare:
-            for step in serve.prepare:
-                if isinstance(step, RunStep):
-                    commands.append(step.command)
-                elif isinstance(step, WorkdirStep):
-                    commands.append(f"cd {step.path}")
-
-        body = "\n".join(filter(None, [env_lines, *commands]))
-        content = f"#!/bin/bash\n\n{body}"
-        console.print(
-            f"\n[bold]Created prepare.sh script to run before packaging ✅[/bold]"
-        )
-        manifest_panel = Panel(
-            Syntax(
-                content,
-                "bash",
-                theme="monokai",
-                background_color="default",
-                line_numbers=True,
-            ),
-            box=box.SQUARE,
-            border_style="bright_black",
-            expand=False,
-        )
-        console.print(manifest_panel, markup=False, highlight=True)
-
-        (prepare_dir / "prepare.sh").write_text(
-            content,
-        )
-        (prepare_dir / "prepare.sh").chmod(0o755)
-
-    def finalize_build(self, serve: Serve) -> None:
-        inner = cast(Any, self.inner_builder)
-        inner.finalize_build(serve)
-
-    def prepare(self, env: Dict[str, str], prepare: List[PrepareStep]) -> None:
-        prepare_dir = self.wasmer_dir_path / "prepare"
-        self.run_serve_command(
-            "bash",
-            extra_args=[
-                f"--mapdir=/prepare:{prepare_dir}",
-                "--",
-                "/prepare/prepare.sh",
-            ],
-        )
-
-    def build_serve(self, serve: Serve) -> None:
-        from tomlkit import comment, document, nl, table, aot, string, array
-
-        doc = document()
-        doc.add(comment(f"Wasmer manifest generated with Shipit v{shipit_version}"))
-        package = table()
-        doc.add("package", package)
-        package.add("entrypoint", "start")
-        dependencies = table()
-        doc.add("dependencies", dependencies)
-
-        binaries = {}
-
-        deps = serve.deps or []
-        # We add bash if it's not present, as the prepare command is run in bash
-        if serve.prepare:
-            if not any(dep.name == "bash" for dep in deps):
-                deps.append(Package("bash"))
-
-        if deps:
-            console.print(f"[bold]Mapping dependencies to Wasmer packages:[/bold]")
-        for dep in deps:
-            if dep.name in self.mapper:
-                version = dep.version or "latest"
-                mapped_dependencies = self.mapper[dep.name]["dependencies"]
-                if dep.architecture:
-                    architecture_dependencies = (
-                        self.mapper[dep.name]
-                        .get("architecture_dependencies", {})
-                        .get(dep.architecture, {})
-                    )
-                    if architecture_dependencies:
-                        mapped_dependencies = architecture_dependencies
-                if version in mapped_dependencies:
-                    console.print(
-                        f"* {dep.name}@{version} mapped to {self.mapper[dep.name]['dependencies'][version]}"
-                    )
-                    package_name, version = mapped_dependencies[version].split("@")
-                    dependencies.add(package_name, version)
-                    scripts = self.mapper[dep.name].get("scripts") or []
-                    for script in scripts:
-                        binaries[script] = {
-                            "script": f"{package_name}:{script}",
-                            "env": self.mapper[dep.name].get("env"),
-                        }
-                    aliases = self.mapper[dep.name].get("aliases") or {}
-                    for alias, script in aliases.items():
-                        binaries[alias] = {
-                            "script": f"{package_name}:{script}",
-                            "env": self.mapper[dep.name].get("env"),
-                        }
-                else:
-                    raise Exception(
-                        f"Dependency {dep.name}@{version} not found in Wasmer"
-                    )
-            else:
-                raise Exception(f"Dependency {dep.name} not found in Wasmer")
-
-        fs = table()
-        doc.add("fs", fs)
-        inner = cast(Any, self.inner_builder)
-        if serve.mounts:
-            for mount in serve.mounts:
-                fs.add(
-                    str(mount.serve_path.absolute()),
-                    str(self.inner_builder.get_serve_mount_path(mount.name).absolute()),
-                )
-
-        doc.add(nl())
-        if serve.commands:
-            commands = aot()
-            doc.add("command", commands)
-            for command_name, command_line in serve.commands.items():
-                command = table()
-                commands.append(command)
-                parts = shlex.split(command_line)
-                program = parts[0]
-                command.add("name", command_name)
-                program_binary = binaries[program]
-                command.add("module", program_binary["script"])
-                command.add("runner", "wasi")
-                wasi_args = table()
-                if serve.cwd:
-                    wasi_args.add("cwd", serve.cwd)
-                wasi_args.add("main-args", array(parts[1:]).multiline(True))
-                env = program_binary.get("env") or {}
-                if serve.env:
-                    env.update(serve.env)
-                if env:
-                    arr = array([f"{k}={v}" for k, v in env.items()]).multiline(True)
-                    wasi_args.add("env", arr)
-                title = string("annotations.wasi", literal=False)
-                command.add(title, wasi_args)
-
-        inner = cast(Any, self.inner_builder)
-        self.wasmer_dir_path.mkdir(parents=True, exist_ok=True)
-
-        manifest = doc.as_string().replace(
-            '[command."annotations.wasi"]', "[command.annotations.wasi]"
-        )
-        console.print(f"\n[bold]Created wasmer.toml manifest ✅[/bold]")
-        manifest_panel = Panel(
-            Syntax(
-                manifest.strip(),
-                "toml",
-                theme="monokai",
-                background_color="default",
-                line_numbers=True,
-            ),
-            box=box.SQUARE,
-            border_style="bright_black",
-            expand=False,
-        )
-        console.print(manifest_panel, markup=False, highlight=True)
-        (self.wasmer_dir_path / "wasmer.toml").write_text(manifest)
-
-        original_app_yaml_path = self.src_dir / "app.yaml"
-        if original_app_yaml_path.exists():
-            console.print(
-                f"[bold]Using original app.yaml found in source directory[/bold]"
-            )
-            yaml_config = yaml.safe_load(original_app_yaml_path.read_text())
-        else:
-            yaml_config = {
-                "kind": "wasmer.io/App.v0",
-            }
-        # Update the app to use the new package
-        yaml_config["package"] = "."
-        if serve.services:
-            capabilities = yaml_config.get("capabilities", {})
-            has_mysql = any(service.provider == "mysql" for service in serve.services)
-            # has_postgres = any(service.provider == "postgres" for service in serve.services)
-            # has_redis = any(service.provider == "redis" for service in serve.services)
-            if has_mysql:
-                capabilities["database"] = {"engine": "mysql"}
-            yaml_config["capabilities"] = capabilities
-
-        # Attach declared volumes to the app manifest (serve-time mounts)
-        if serve.volumes:
-            volumes_yaml = yaml_config.get("volumes", [])
-            for vol in serve.volumes:
-                volumes_yaml.append(
-                    {
-                        "name": vol.name,
-                        "mount": str(vol.serve_path),
-                    }
-                )
-            yaml_config["volumes"] = volumes_yaml
-
-        # If it has a php dependency, set the scaling mode to single_concurrency
-        has_php = any(dep.name == "php" for dep in serve.deps)
-        if has_php:
-            scaling = yaml_config.get("scaling", {})
-            scaling["mode"] = "single_concurrency"
-            yaml_config["scaling"] = scaling
-
-        if "after_deploy" in serve.commands:
-            jobs = yaml_config.get("jobs", [])
-            jobs.append(
-                {
-                    "name": "after_deploy",
-                    "trigger": "post-deployment",
-                    "action": {"execute": {"command": "after_deploy"}},
-                }
-            )
-            yaml_config["jobs"] = jobs
-
-        app_yaml = yaml.dump(
-            yaml_config,
-        )
-
-        console.print(f"\n[bold]Created app.yaml manifest ✅[/bold]")
-        app_yaml_panel = Panel(
-            Syntax(
-                app_yaml.strip(),
-                "yaml",
-                theme="monokai",
-                background_color="default",
-                line_numbers=True,
-            ),
-            box=box.SQUARE,
-            border_style="bright_black",
-            expand=False,
-        )
-        console.print(app_yaml_panel, markup=False, highlight=True)
-        (self.wasmer_dir_path / "app.yaml").write_text(app_yaml)
-
-        # self.inner_builder.build_serve(serve)
-
-    def run_serve_command(
-        self, command: str, extra_args: Optional[List[str]] = None
-    ) -> None:
-        console.print(f"\n[bold]Serving site[/bold]: running {command} command")
-        extra_args = extra_args or []
-
-        if self.wasmer_registry:
-            extra_args = [f"--registry={self.wasmer_registry}"] + extra_args
-        self.run_command(
-            self.bin,
-            [
-                "run",
-                str(self.wasmer_dir_path.absolute()),
-                "--net",
-                f"--command={command}",
-                *extra_args,
-            ],
-        )
-
-    def run_command(
-        self, command: str, extra_args: Optional[List[str]] | None = None
-    ) -> Any:
-        sh.Command(command)(
-            *(extra_args or []), _out=write_stdout, _err=write_stderr, _env=os.environ
-        )
-
-    def deploy_config(self, config_path: Path) -> None:
-        package_webc_path = self.wasmer_dir_path / "package.webc"
-        app_yaml_path = self.wasmer_dir_path / "app.yaml"
-        package_webc_path.parent.mkdir(parents=True, exist_ok=True)
-        self.run_command(
-            self.bin,
-            ["package", "build", self.wasmer_dir_path, "--out", package_webc_path],
-        )
-        config_path.write_text(
-            json.dumps(
-                {
-                    "app_yaml_path": str(app_yaml_path.absolute()),
-                    "package_webc_path": str(package_webc_path.absolute()),
-                    "package_webc_size": package_webc_path.stat().st_size,
-                    "package_webc_sha256": hashlib.sha256(
-                        package_webc_path.read_bytes()
-                    ).hexdigest(),
-                }
-            )
-        )
-        console.print(f"\n[bold]Saved deploy config to {config_path}[/bold]")
-
-    def deploy(
-        self, app_owner: Optional[str] = None, app_name: Optional[str] = None
-    ) -> str:
-        extra_args = []
-        if self.wasmer_registry:
-            extra_args += ["--registry", self.wasmer_registry]
-        if self.wasmer_token:
-            extra_args += ["--token", self.wasmer_token]
-        if app_owner:
-            extra_args += ["--owner", app_owner]
-        if app_name:
-            extra_args += ["--app-name", app_name]
-        # self.run_command(
-        #     self.bin,
-        #     [
-        #         "package",
-        #         "push",
-        #         self.wasmer_dir_path,
-        #         "--namespace",
-        #         app_owner,
-        #         "--non-interactive",
-        #         *extra_args,
-        #     ],
-        # )
-        return self.run_command(
-            self.bin,
-            [
-                "deploy",
-                "--publish-package",
-                "--dir",
-                self.wasmer_dir_path,
-                "--non-interactive",
-                *extra_args,
-            ],
-        )
+    serve_path: str
 
 
 class Ctx:
-    def __init__(self, builder: Builder) -> None:
-        self.builder = builder
+    def __init__(self, build_backend: BuildBackend, runner: Runner) -> None:
+        self.build_backend = build_backend
+        self.runner = runner
         self.packages: Dict[str, Package] = {}
         self.builds: List[Build] = []
         self.steps: List[Step] = []
@@ -1208,7 +60,6 @@ class Ctx:
         self.mounts: List[Mount] = []
         self.volumes: List[Volume] = []
         self.services: Dict[str, Service] = {}
-        self.getenv_variables: Set[str] = set()
 
     def add_package(self, package: Package) -> str:
         index = f"{package.name}@{package.version}" if package.version else package.name
@@ -1254,10 +105,6 @@ class Ctx:
         self.steps.append(step)
         return f"ref:step:{len(self.steps) - 1}"
 
-    def getenv(self, name: str) -> Optional[str]:
-        self.getenv_variables.add(name)
-        return self.builder.getenv(name)
-
     def dep(
         self,
         name: str,
@@ -1306,7 +153,7 @@ class Ctx:
             commands=commands,
             prepare=prepare_steps,
             workers=workers,
-            mounts=self.get_refs([mount["ref"] for mount in mounts])
+            mounts=self.get_refs([mount.ref for mount in mounts])
             if mounts
             else None,
             volumes=self.get_refs([volume["ref"] for volume in volumes])
@@ -1337,10 +184,12 @@ class Ctx:
     def copy(
         self,
         source: str,
-        target: str,
+        target: Optional[str] = None,
         ignore: Optional[List[str]] = None,
         base: Optional[Literal["source", "assets"]] = None,
     ) -> Optional[str]:
+        if target is None:
+            target = source
         step = CopyStep(source, target, ignore, base or "source")
         return self.add_step(step)
 
@@ -1353,15 +202,12 @@ class Ctx:
         return f"ref:mount:{len(self.mounts) - 1}"
 
     def mount(self, name: str) -> Optional[str]:
-        build_path = self.builder.get_build_mount_path(name)
-        serve_path = self.builder.get_serve_mount_path(name)
+        build_path = self.build_backend.get_build_mount_path(name)
+        serve_path = self.runner.get_serve_mount_path(name)
         mount = Mount(name, build_path, serve_path)
         ref = self.add_mount(mount)
-        return {
-            "ref": ref,
-            "build": str(build_path.absolute()),
-            "serve": str(serve_path.absolute()),
-        }
+        
+        return CtxMount(ref=ref, path=str(build_path.absolute()), serve_path=str(serve_path.absolute()))
 
     def add_volume(self, volume: Volume) -> Optional[str]:
         self.volumes.append(volume)
@@ -1377,35 +223,76 @@ class Ctx:
         }
 
 
-def evaluate_shipit(shipit_file: Path, builder: Builder) -> Tuple[Ctx, Serve]:
+def evaluate_shipit(
+    shipit_file: Path,
+    build_backend: BuildBackend,
+    runner: Runner,
+    provider_config: Config,
+) -> Tuple[Ctx, Serve]:
     source = shipit_file.read_text()
-    ctx = Ctx(builder)
-    glb = sl.Globals.standard()
-    mod = sl.Module()
-
-    mod.add_callable("service", ctx.service)
-    mod.add_callable("getenv", ctx.getenv)
-    mod.add_callable("dep", ctx.dep)
-    mod.add_callable("serve", ctx.serve)
-    mod.add_callable("run", ctx.run)
-    mod.add_callable("mount", ctx.mount)
-    mod.add_callable("volume", ctx.volume)
-    mod.add_callable("workdir", ctx.workdir)
-    mod.add_callable("copy", ctx.copy)
-    mod.add_callable("path", ctx.path)
-    mod.add_callable("env", ctx.env)
-    mod.add_callable("use", ctx.use)
-
-    dialect = sl.Dialect.extended()
-    dialect.enable_f_strings = True
-
-    ast = sl.parse("shipit", source, dialect=dialect)
-
-    sl.eval(mod, ast, glb)
+    ctx = Ctx(build_backend, runner)
+    glb = sl.GlobalsBuilder.standard()
+
+    glb.set("PORT", str(provider_config.port or "8080"))
+    glb.set("config", provider_config)
+    glb.set("service", ctx.service)
+    glb.set("dep", ctx.dep)
+    glb.set("serve", ctx.serve)
+    glb.set("run", ctx.run)
+    glb.set("mount", ctx.mount)
+    glb.set("volume", ctx.volume)
+    glb.set("workdir", ctx.workdir)
+    glb.set("copy", ctx.copy)
+    glb.set("path", ctx.path)
+    glb.set("env", ctx.env)
+    glb.set("use", ctx.use)
+
+    dialect = sl.Dialect(enable_keyword_only_arguments=True, enable_f_strings=True)
+
+    ast = sl.AstModule.parse("Shipit", source, dialect=dialect)
+
+    evaluator = sl.Evaluator()
+    evaluator.eval_module(ast, glb.build())
     if not ctx.serves:
         raise ValueError(f"No serve definition found in {shipit_file}")
     assert len(ctx.serves) <= 1, "Only one serve is allowed for now"
     serve = next(iter(ctx.serves.values()))
+    
+    # Now we apply the custom commands (start, after_deploy, build, install)
+    if provider_config.commands.start:
+        serve.commands["start"] = provider_config.commands.start
+
+    if provider_config.commands.after_deploy:
+        serve.commands["after_deploy"] = provider_config.commands.after_deploy
+
+    if provider_config.commands.build or provider_config.commands.install:
+        new_build = []
+        has_done_build = False
+        has_done_install = False
+        for step in serve.build:
+            if isinstance(step, RunStep):
+                if step.group == "build" and not has_done_build and provider_config.commands.build:
+                    new_build.append(RunStep(provider_config.commands.build, group="build"))
+                    has_done_build = True
+                elif step.group == "install" and not has_done_install and provider_config.commands.install:
+                    new_build.append(RunStep(provider_config.commands.install, group="install"))
+                    has_done_install = True
+                else:
+                    new_build.append(step)
+            else:
+                new_build.append(step)
+        if not has_done_install and provider_config.commands.install:
+            new_build.append(RunStep(provider_config.commands.install, group="install"))
+        if not has_done_build and provider_config.commands.build:
+            new_build.append(RunStep(provider_config.commands.build, group="build"))
+        serve.build = new_build
+
+    if serve.commands.get("start"):
+        serve.commands["start"] = serve.commands["start"].replace("$PORT", str(provider_config.port or "8080"))
+    
+    if serve.commands.get("after_deploy"):
+        serve.commands["after_deploy"] = serve.commands["after_deploy"].replace("$PORT", str(provider_config.port or "8080"))
+
     return ctx, serve
 
 
@@ -1419,13 +306,6 @@ def print_help() -> None:
     console.print(panel)
 
 
-def download_file(url: str, path: Path) -> None:
-    response = requests.get(url)
-    response.raise_for_status()
-    path.parent.mkdir(parents=True, exist_ok=True)
-    path.write_bytes(response.content)
-
-
 @app.command(name="auto")
 def auto(
     path: Path = typer.Argument(
@@ -1497,10 +377,6 @@ def auto(
         None,
         help="Name of the Wasmer app.",
     ),
-    use_procfile: bool = typer.Option(
-        True,
-        help="Use the Procfile to generate the default custom commands (install, build, start, after_deploy).",
-    ),
     install_command: Optional[str] = typer.Option(
         None,
         help="The install command to use (overwrites the default)",
@@ -1517,10 +393,18 @@ def auto(
         None,
         help="The environment to use (defaults to `.env`, it will use .env.<env_name> if provided)",
     ),
-    use_provider: Optional[str] = typer.Option(
+    provider: Optional[str] = typer.Option(
         None,
         help="Use a specific provider to build the project.",
     ),
+    config: Optional[str] = typer.Option(
+        None,
+        help="The JSON content to use as input.",
+    ),
+    serve_port: Optional[int] = typer.Option(
+        None,
+        help="The port to use (defaults to 8080).",
+    ),
 ):
     if not path.exists():
         raise Exception(f"The path {path} does not exist")
@@ -1543,16 +427,19 @@ def auto(
         generate(
             path,
             out=shipit_path,
-            use_procfile=use_procfile,
             install_command=install_command,
             build_command=build_command,
             start_command=start_command,
-            use_provider=use_provider,
+            provider=provider,
+            config=config,
         )
 
     build(
         path,
         shipit_path=shipit_path,
+        install_command=install_command,
+        build_command=build_command,
+        start_command=start_command,
         wasmer=(wasmer or wasmer_deploy),
         docker=docker,
         docker_client=docker_client,
@@ -1562,6 +449,9 @@ def auto(
         wasmer_bin=wasmer_bin,
         skip_prepare=skip_prepare,
         env_name=env_name,
+        serve_port=serve_port,
+        provider=provider,
+        config=config,
     )
     if start or wasmer_deploy or wasmer_deploy_config:
         serve(
@@ -1596,10 +486,6 @@ def generate(
         "--shipit-path",
         help="Output path (defaults to the Shipit file in the provided path).",
     ),
-    use_procfile: bool = typer.Option(
-        True,
-        help="Use the Procfile to generate the default custom commands (install, build, start, after_deploy).",
-    ),
     install_command: Optional[str] = typer.Option(
         None,
         help="The install command to use (overwrites the default)",
@@ -1612,41 +498,48 @@ def generate(
         None,
         help="The start command to use (overwrites the default)",
     ),
-    use_provider: Optional[str] = typer.Option(
+    provider: Optional[str] = typer.Option(
         None,
         help="Use a specific provider to build the project.",
     ),
+    config: Optional[str] = typer.Option(
+        None,
+        help="The JSON content to use as input.",
+    ),
 ):
     if not path.exists():
         raise Exception(f"The path {path} does not exist")
 
     if out is None:
         out = path / "Shipit"
-    custom_commands = CustomCommands()
-    # if (path / "Dockerfile").exists():
-    #     # We get the start command from the Dockerfile
-    #     with open(path / "Dockerfile", "r") as f:
-    #         cmd = None
-    #         for line in f:
-    #             if line.startswith("CMD "):
-    #                 cmd = line[4:].strip()
-    #                 cmd = json.loads(cmd)
-    #         # We get the last command
-    #         if cmd:
-    #             if isinstance(cmd, list):
-    #                 cmd = " ".join(cmd)
-    #             custom_commands.start = cmd
-    if use_procfile:
-        if (path / "Procfile").exists():
-            procfile = Procfile.loads((path / "Procfile").read_text())
-            custom_commands.start = procfile.get_start_command()
+
+    base_config = Config()
+    base_config.commands.enrich_from_path(path)
     if start_command:
-        custom_commands.start = start_command
+        base_config.commands.start = start_command
     if install_command:
-        custom_commands.install = install_command
+        base_config.commands.install = install_command
     if build_command:
-        custom_commands.build = build_command
-    content = generate_shipit(path, custom_commands, use_provider=use_provider)
+        base_config.commands.build = build_command
+    provider_cls = load_provider(path, base_config, use_provider=provider)
+    provider_config = load_provider_config(provider_cls, path, base_config, config=config)
+    provider = provider_cls(path, provider_config)
+    content = generate_shipit(path, provider)
+    config_json = provider_config.model_dump_json(indent=2, exclude_defaults=True)
+    if config_json and config_json != "{}":
+        manifest_panel = Panel(
+            Syntax(
+                config_json,
+                "json",
+                theme="monokai",
+                background_color="default",
+                line_numbers=True,
+            ),
+            box=box.SQUARE,
+            border_style="bright_black",
+            expand=False,
+        )
+        console.print(manifest_panel, markup=False, highlight=True)
     out.write_text(content)
     console.print(f"[bold]Generated Shipit[/bold] at {out.absolute()}")
 
@@ -1726,22 +619,35 @@ def serve(
     if not path.exists():
         raise Exception(f"The path {path} does not exist")
 
-    builder: Builder
     if docker or docker_client:
-        builder = DockerBuilder(path, docker_client)
+        build_backend: BuildBackend = DockerBuildBackend(
+            path, ASSETS_PATH, docker_client
+        )
     else:
-        builder = LocalBuilder(path)
-    if wasmer or wasmer_deploy or wasmer_deploy_config:
-        builder = WasmerBuilder(
-            builder, path, registry=wasmer_registry, token=wasmer_token, bin=wasmer_bin
+        build_backend = LocalBuildBackend(path, ASSETS_PATH)
+
+    needs_wasmer = wasmer or wasmer_deploy or wasmer_deploy_config
+    if needs_wasmer:
+        runner: Runner = WasmerRunner(
+            build_backend,
+            path,
+            registry=wasmer_registry,
+            token=wasmer_token,
+            bin=wasmer_bin,
         )
+    else:
+        runner = LocalRunner(build_backend, path)
 
     if wasmer_deploy_config:
-        builder.deploy_config(wasmer_deploy_config)
+        if not isinstance(runner, WasmerRunner):
+            raise RuntimeError("--wasmer-deploy-config requires the Wasmer runner")
+        runner.deploy_config(wasmer_deploy_config)
     elif wasmer_deploy:
-        builder.deploy(app_owner=wasmer_app_owner, app_name=wasmer_app_name)
+        if not isinstance(runner, WasmerRunner):
+            raise RuntimeError("--wasmer-deploy requires the Wasmer runner")
+        runner.deploy(app_owner=wasmer_app_owner, app_name=wasmer_app_name)
     elif start:
-        builder.run_serve_command("start")
+        runner.run_serve_command("start")
 
 
 @app.command(name="plan")
@@ -1794,10 +700,6 @@ def plan(
         None,
         help="Use a specific Docker client (such as depot, podman, etc.)",
     ),
-    use_procfile: bool = typer.Option(
-        True,
-        help="Use the Procfile to generate the default custom commands (install, build, start, after_deploy).",
-    ),
     install_command: Optional[str] = typer.Option(
         None,
         help="The install command to use (overwrites the default)",
@@ -1810,10 +712,18 @@ def plan(
         None,
         help="The start command to use (overwrites the default)",
     ),
-    use_provider: Optional[str] = typer.Option(
+    provider: Optional[str] = typer.Option(
         None,
         help="Use a specific provider to build the project.",
     ),
+    config: Optional[str] = typer.Option(
+        None,
+        help="The JSON content to use as input.",
+    ),
+    serve_port: Optional[int] = typer.Option(
+        None,
+        help="The port to use (defaults to 8080).",
+    ),
 ) -> None:
     if not path.exists():
         raise Exception(f"The path {path} does not exist")
@@ -1836,39 +746,46 @@ def plan(
         generate(
             path,
             out=shipit_path,
-            use_procfile=use_procfile,
             install_command=install_command,
             build_command=build_command,
             start_command=start_command,
-            use_provider=use_provider,
+            provider=provider,
+            config=config,
         )
 
-    custom_commands = CustomCommands()
-    procfile_path = path / "Procfile"
-    if procfile_path.exists():
-        try:
-            procfile = Procfile.loads(procfile_path.read_text())
-            custom_commands.start = procfile.get_start_command()
-        except Exception:
-            pass
-
     shipit_file = get_shipit_path(path, shipit_path)
 
-    builder: Builder
     if docker or docker_client:
-        builder = DockerBuilder(path, docker_client)
+        build_backend: BuildBackend = DockerBuildBackend(
+            path, ASSETS_PATH, docker_client
+        )
     else:
-        builder = LocalBuilder(path)
+        build_backend = LocalBuildBackend(path, ASSETS_PATH)
     if wasmer:
-        builder = WasmerBuilder(
-            builder, path, registry=wasmer_registry, token=wasmer_token, bin=wasmer_bin
+        runner: Runner = WasmerRunner(
+            build_backend,
+            path,
+            registry=wasmer_registry,
+            token=wasmer_token,
+            bin=wasmer_bin,
         )
+    else:
+        runner = LocalRunner(build_backend, path)
 
-    ctx, serve = evaluate_shipit(shipit_file, builder)
-    metadata_commands: Dict[str, Optional[str]] = {
-        "start": serve.commands.get("start"),
-        "after_deploy": serve.commands.get("after_deploy"),
-    }
+    base_config = Config()
+    base_config.commands.enrich_from_path(path)
+    if install_command:
+        base_config.commands.install = install_command
+    if build_command:
+        base_config.commands.build = build_command
+    if start_command:
+        base_config.commands.start = start_command
+    if serve_port:
+        base_config.port = serve_port
+    provider_cls = load_provider(path, base_config, use_provider=provider)
+    provider_config = load_provider_config(provider_cls, path, base_config, config=config)
+    # provider_config = runner.prepare_config(provider_config)
+    ctx, serve = evaluate_shipit(shipit_file, build_backend, runner, provider_config)
 
     def _collect_group_commands(group: str) -> Optional[str]:
         commands = [
@@ -1880,25 +797,23 @@ def plan(
             return None
         return " && ".join(commands)
 
-    metadata_install = _collect_group_commands("install")
-    metadata_build = _collect_group_commands("build")
-    metadata_commands["install"] = metadata_install
-    metadata_commands["build"] = metadata_build
-    platform: Optional[str]
-    try:
-        provider_cls = detect_provider(path, custom_commands)
-        provider_instance = provider_cls(path, custom_commands)
-        provider_instance.initialize()
-        platform = provider_instance.platform()
-    except Exception:
-        platform = None
+    start_command = serve.commands.get("start")
+    after_deploy_command = serve.commands.get("after_deploy")
+    install_command = _collect_group_commands("install")
+    build_command = _collect_group_commands("build")
+    if start_command:
+        provider_config.commands.start = start_command
+    if after_deploy_command:
+        provider_config.commands.after_deploy = after_deploy_command
+    if install_command:
+        provider_config.commands.install = install_command
+    if build_command:
+        provider_config.commands.build = build_command
     plan_output = {
-        "provider": serve.provider,
-        "metadata": {
-            "platform": platform,
-            "commands": metadata_commands,
-        },
-        "config": sorted(ctx.getenv_variables),
+        "provider": provider_cls.name(),
+        "config": json.loads(
+            provider_config.model_dump_json(exclude_defaults=True)
+        ),
         "services": [
             {"name": svc.name, "provider": svc.provider}
             for svc in (serve.services or [])
@@ -1925,6 +840,18 @@ def build(
         None,
         help="The path to the Shipit file (defaults to Shipit in the provided path).",
     ),
+    start_command: Optional[str] = typer.Option(
+        None,
+        help="The start command to use (overwrites the default)",
+    ),
+    install_command: Optional[str] = typer.Option(
+        None,
+        help="The install command to use (overwrites the default)",
+    ),
+    build_command: Optional[str] = typer.Option(
+        None,
+        help="The build command to use (overwrites the default)",
+    ),
     wasmer: bool = typer.Option(
         False,
         help="Use Wasmer to build and serve the project.",
@@ -1961,23 +888,59 @@ def build(
         None,
         help="The environment to use (defaults to `.env`, it will use .env.<env_name> if provided)",
     ),
+    serve_port: Optional[int] = typer.Option(
+        None,
+        help="The port to use (defaults to 8080).",
+    ),
+    provider: Optional[str] = typer.Option(
+        None,
+        help="Use a specific provider to build the project.",
+    ),
+    config: Optional[str] = typer.Option(
+        None,
+        help="The JSON content to use as input.",
+    ),
 ) -> None:
     if not path.exists():
         raise Exception(f"The path {path} does not exist")
 
     shipit_file = get_shipit_path(path, shipit_path)
 
-    builder: Builder
     if docker or docker_client:
-        builder = DockerBuilder(path, docker_client)
+        build_backend: BuildBackend = DockerBuildBackend(
+            path, ASSETS_PATH, docker_client
+        )
     else:
-        builder = LocalBuilder(path)
+        build_backend = LocalBuildBackend(path, ASSETS_PATH)
     if wasmer:
-        builder = WasmerBuilder(
-            builder, path, registry=wasmer_registry, token=wasmer_token, bin=wasmer_bin
+        runner: Runner = WasmerRunner(
+            build_backend,
+            path,
+            registry=wasmer_registry,
+            token=wasmer_token,
+            bin=wasmer_bin,
         )
+    else:
+        runner = LocalRunner(build_backend, path)
 
-    ctx, serve = evaluate_shipit(shipit_file, builder)
+    base_config = Config()
+    base_config.commands.enrich_from_path(path)
+    if start_command:
+        base_config.commands.start = start_command
+    if install_command:
+        base_config.commands.install = install_command
+    if build_command:
+        base_config.commands.build = build_command
+    serve_port = serve_port or os.environ.get("PORT")
+    if serve_port:
+        base_config.port = serve_port
+
+    provider_cls = load_provider(path, base_config, use_provider=provider)
+    provider_config = load_provider_config(provider_cls, path, base_config, config=config)
+    provider_config = runner.prepare_config(provider_config)
+    ctx, serve = evaluate_shipit(
+        shipit_file, build_backend, runner, provider_config
+    )
     env = {
         "PATH": "",
         "COLORTERM": os.environ.get("COLORTERM", ""),
@@ -1997,6 +960,9 @@ def build(
             return build(
                 path,
                 shipit_path=shipit_path,
+                install_command=install_command,
+                build_command=build_command,
+                start_command=start_command,
                 wasmer=wasmer,
                 skip_prepare=skip_prepare,
                 wasmer_bin=wasmer_bin,
@@ -2006,6 +972,9 @@ def build(
                 docker_client=None,
                 skip_docker_if_safe_build=False,
                 env_name=env_name,
+                serve_port=serve_port,
+                provider=provider,
+                config=config,
             )
 
     serve.env = serve.env or {}
@@ -2017,14 +986,13 @@ def build(
         env_vars = dotenv_values(path / f".env.{env_name}")
         serve.env.update(env_vars)
 
+    assert serve.commands.get("start"), "No start command could be found, please provide a start command"
+
     # Build and serve
-    builder.build(env, serve.mounts, serve.build)
-    if serve.prepare:
-        builder.build_prepare(serve)
-    builder.build_serve(serve)
-    builder.finalize_build(serve)
+    build_backend.build(serve.name, env, serve.mounts or [], serve.build)
+    runner.build(serve)
     if serve.prepare and not skip_prepare:
-        builder.prepare(env, serve.prepare)
+        runner.prepare(env, serve.prepare)
 
 
 def get_shipit_path(path: Path, shipit_path: Optional[Path] = None) -> Path: