shipit-cli 0.20.2__tar.gz → 0.21.1__tar.gz

{shipit_cli-0.20.2 → shipit_cli-0.21.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.20.2
+Version: 0.21.1
 Summary: Shipit CLI is the best way to build, serve and deploy your projects anywhere.
 Project-URL: homepage, https://wasmer.io
 Project-URL: repository, https://github.com/wasmerio/shipit

{shipit_cli-0.20.2 → shipit_cli-0.21.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shipit-cli"
-version = "0.20.2"
+version = "0.21.1"
 description = "Shipit CLI is the best way to build, serve and deploy your projects anywhere."
 readme = "README.md"
 requires-python = ">=3.10"

{shipit_cli-0.20.2 → shipit_cli-0.21.1}/src/shipit/assets/wordpress/install.sh

@@ -19,7 +19,10 @@ mkdir -p wp-content/upgrade
 
 if [ -n "${WPCONTENT_BASE_PATH:-}" ] && [ -d "${WPCONTENT_BASE_PATH}" ]; then
   shopt -s dotglob nullglob
-  cp -R "${WPCONTENT_BASE_PATH}"/* /app/wp-content || true
+  # Note: change this back to copy all, once using the WP Zip files.
+  # cp -R "${WPCONTENT_BASE_PATH}"/* /app/wp-content || true
+  cp -R "${WPCONTENT_BASE_PATH}"/plugins/* /app/wp-content/plugins || true
+  cp -R "${WPCONTENT_BASE_PATH}"/themes/twentytwenty* /app/wp-content/themes || true
   shopt -u dotglob nullglob
 fi
 

{shipit_cli-0.20.2 → shipit_cli-0.21.1}/src/shipit/builders/docker.py

@@ -45,12 +45,17 @@ class DockerBuildBackend:
     }
 
     def __init__(
-        self, src_dir: Path, assets_path: Path, docker_client: Optional[str] = None,
-        docker_opts: Optional[str] = None
+        self,
+        src_dir: Path,
+        assets_path: Path,
+        docker_client: Optional[str] = None,
+        docker_opts: Optional[str] = None,
+        shipit_dir: Optional[Path] = None,
     ) -> None:
         self.src_dir = src_dir
         self.assets_path = assets_path
-        self.docker_path = self.src_dir / ".shipit" / "docker"
+        self.shipit_dir = shipit_dir or self.src_dir / ".shipit"
+        self.docker_path = self.shipit_dir / "docker"
         self.docker_path.mkdir(parents=True, exist_ok=True)
         self.docker_out_path = self.docker_path / "out"
         self.docker_file_path = self.docker_path / "Dockerfile"
@@ -77,7 +82,7 @@ class DockerBuildBackend:
         return self.docker_out_path / self.get_mount_path(name)
 
     def get_volume_path(self, name: str) -> Path:
-        return self.src_dir / ".shipit" / "volumes" / name
+        return self.shipit_dir / "volumes" / name
 
     @property
     def is_depot(self) -> bool:
@@ -162,6 +167,15 @@ RUN curl https://mise.run | sh
                 docker_file_contents += f"WORKDIR {step.path.absolute()}\n"
             elif isinstance(step, RunStep):
                 if step.inputs:
+                    parents = sorted(
+                        {
+                            Path(input).parent.as_posix()
+                            for input in step.inputs
+                            if Path(input).parent != Path(".")
+                        }
+                    )
+                    for parent in parents:
+                        docker_file_contents += f"RUN mkdir -p {parent}\n"
                     pre = "\\\n  " + "".join(
                         [
                             f"--mount=type=bind,source={input},target={input} \\\n  "

{shipit_cli-0.20.2 → shipit_cli-0.21.1}/src/shipit/builders/local.py

@@ -25,10 +25,16 @@ from shipit.utils import download_file
 
 
 class LocalBuildBackend:
-    def __init__(self, src_dir: Path, assets_path: Path) -> None:
+    def __init__(
+        self,
+        src_dir: Path,
+        assets_path: Path,
+        shipit_dir: Optional[Path] = None,
+    ) -> None:
         self.src_dir = src_dir
         self.assets_path = assets_path
-        self.local_path = self.src_dir / ".shipit" / "local"
+        self.shipit_dir = shipit_dir or self.src_dir / ".shipit"
+        self.local_path = self.shipit_dir / "local"
         self.build_path = self.local_path / "build"
         self.workdir = self.build_path
         self.runtime_path: Optional[str] = None
@@ -46,7 +52,7 @@ class LocalBuildBackend:
         return self.get_mount_path(name)
 
     def get_volume_path(self, name: str) -> Path:
-        return self.src_dir / ".shipit" / "volumes" / name
+        return self.shipit_dir / "volumes" / name
 
     def execute_step(self, step: Step, env: Dict[str, str]) -> None:
         build_path = self.workdir
@@ -62,8 +68,14 @@ class LocalBuildBackend:
             extra = ""
             if step.inputs:
                 for input in step.inputs:
-                    console.print(f"Copying {input} to {build_path / input}")
-                    shutil.copy((self.src_dir / input), (build_path / input))
+                    source = self.src_dir / input
+                    target = build_path / input
+                    console.print(f"Copying {input} to {target}")
+                    target.parent.mkdir(parents=True, exist_ok=True)
+                    if source.is_dir():
+                        shutil.copytree(source, target, dirs_exist_ok=True)
+                    else:
+                        shutil.copy(source, target)
                 all_inputs = ", ".join(step.inputs)
                 extra = f" [bright_black]# using {all_inputs}[/bright_black]"
             console.print(
@@ -113,11 +125,25 @@ class LocalBuildBackend:
                     raise Exception(f"Unknown base: {step.base}")
 
                 console.print(
-                    f"[bold]Copy to {step.target} from {step.source}[/bold]{ignore_extra}"
+                    "[bold]Copy to "
+                    f"{step.target} from {step.source}[/bold]{ignore_extra}"
                 )
 
-                source = base / step.source
-                target = build_path / step.target
+                source_path = Path(step.source)
+                target_path = Path(step.target)
+                source = (
+                    source_path
+                    if source_path.is_absolute()
+                    else base / source_path
+                )
+                target = (
+                    target_path
+                    if target_path.is_absolute()
+                    else build_path / target_path
+                )
+                if source.resolve(strict=False) == target.resolve(strict=False):
+                    return
+                target.parent.mkdir(parents=True, exist_ok=True)
                 if source.is_dir():
                     shutil.copytree(
                         source,