compose2pod 0.3.0__tar.gz → 0.3.1__tar.gz

{compose2pod-0.3.0 → compose2pod-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compose2pod
-Version: 0.3.0
+Version: 0.3.1
 Summary: Convert a Docker Compose file into a script that runs its services as a single Podman pod
 Keywords: podman,docker-compose,compose,pod,ci,testing,containers
 Author: Artur Shiriev
@@ -83,15 +83,35 @@ sh ./run.sh
 
 ## Supported compose subset
 
-compose2pod supports an honest subset and errors clearly on anything outside
-it: `image`/`build`, `command`, `environment`/`env_file`, short-form bind
-`volumes`, `healthcheck` (CMD/CMD-SHELL), `depends_on` (all conditions), and
-network `aliases`. Compose extension fields (any `x-`-prefixed key) and YAML
-anchors are accepted as-is, so a top-level `x-*` anchor block for shared
-config just works. `${VAR}`-style variable interpolation is left live in the
-generated script, resolved by its shell against the environment present
-when the script runs (no `.env` file support). See
-`architecture/supported-subset.md` for the full accept/ignore/reject matrix.
+compose2pod refuses **every document `docker compose config` refuses** — a
+measured property, checked continuously by a differential conformance harness
+that runs the real Docker CLI and the real compose2pod pipeline over the same
+YAML. So a file that compiles is a file Docker would run; where compose2pod
+still refuses a form Docker accepts, it is because Podman genuinely cannot
+express it (each such case is documented, not guessed).
+
+Within that boundary it covers most of what real compose files use:
+
+- **Services** — `image`/`build`, `command`/`entrypoint`, `environment` and
+  `env_file` (string and long-form `{path, required, format}`), `volumes`
+  (short-form and long-form `--mount`, including the `bind`/`volume`/`tmpfs`
+  option maps), `tmpfs`, `healthcheck`, `depends_on` (all conditions), network
+  `aliases`, `hostname`/`container_name`.
+- **Confinement & metadata** — `user`, `working_dir`, `read_only`, `init`,
+  `privileged`, `cap_add`/`cap_drop`, `security_opt`, `devices`, `group_add`,
+  `platform`, `labels`, `annotations`, `pull_policy` (the quoted-boolean and
+  YAML-1.1 spellings Docker accepts, too).
+- **Resources** — the legacy keys (`mem_limit`, `cpus`, `pids_limit`,
+  `ulimits`, …) and the modern `deploy.resources` block.
+- **Pod-wide** — `dns`/`dns_search`/`dns_opt`, `sysctls`, `extra_hosts`.
+- **Composition** — same-file `extends`, `secrets`/`configs`, `profiles`.
+
+Compose extension fields (any `x-`-prefixed key) and YAML anchors are accepted
+as-is, so a top-level `x-*` anchor block for shared config just works.
+`${VAR}`-style variable interpolation is left live in the generated script,
+resolved by its shell against the environment present when the script runs (no
+`.env` file support). See `architecture/supported-subset.md` for the full
+accept/ignore/reject matrix and `planning/decisions/` for the boundary rulings.
 
 ## Status
 

{compose2pod-0.3.0 → compose2pod-0.3.1}/README.md

@@ -57,15 +57,35 @@ sh ./run.sh
 
 ## Supported compose subset
 
-compose2pod supports an honest subset and errors clearly on anything outside
-it: `image`/`build`, `command`, `environment`/`env_file`, short-form bind
-`volumes`, `healthcheck` (CMD/CMD-SHELL), `depends_on` (all conditions), and
-network `aliases`. Compose extension fields (any `x-`-prefixed key) and YAML
-anchors are accepted as-is, so a top-level `x-*` anchor block for shared
-config just works. `${VAR}`-style variable interpolation is left live in the
-generated script, resolved by its shell against the environment present
-when the script runs (no `.env` file support). See
-`architecture/supported-subset.md` for the full accept/ignore/reject matrix.
+compose2pod refuses **every document `docker compose config` refuses** — a
+measured property, checked continuously by a differential conformance harness
+that runs the real Docker CLI and the real compose2pod pipeline over the same
+YAML. So a file that compiles is a file Docker would run; where compose2pod
+still refuses a form Docker accepts, it is because Podman genuinely cannot
+express it (each such case is documented, not guessed).
+
+Within that boundary it covers most of what real compose files use:
+
+- **Services** — `image`/`build`, `command`/`entrypoint`, `environment` and
+  `env_file` (string and long-form `{path, required, format}`), `volumes`
+  (short-form and long-form `--mount`, including the `bind`/`volume`/`tmpfs`
+  option maps), `tmpfs`, `healthcheck`, `depends_on` (all conditions), network
+  `aliases`, `hostname`/`container_name`.
+- **Confinement & metadata** — `user`, `working_dir`, `read_only`, `init`,
+  `privileged`, `cap_add`/`cap_drop`, `security_opt`, `devices`, `group_add`,
+  `platform`, `labels`, `annotations`, `pull_policy` (the quoted-boolean and
+  YAML-1.1 spellings Docker accepts, too).
+- **Resources** — the legacy keys (`mem_limit`, `cpus`, `pids_limit`,
+  `ulimits`, …) and the modern `deploy.resources` block.
+- **Pod-wide** — `dns`/`dns_search`/`dns_opt`, `sysctls`, `extra_hosts`.
+- **Composition** — same-file `extends`, `secrets`/`configs`, `profiles`.
+
+Compose extension fields (any `x-`-prefixed key) and YAML anchors are accepted
+as-is, so a top-level `x-*` anchor block for shared config just works.
+`${VAR}`-style variable interpolation is left live in the generated script,
+resolved by its shell against the environment present when the script runs (no
+`.env` file support). See `architecture/supported-subset.md` for the full
+accept/ignore/reject matrix and `planning/decisions/` for the boundary rulings.
 
 ## Status
 

{compose2pod-0.3.0 → compose2pod-0.3.1}/compose2pod/emit.py

@@ -95,15 +95,15 @@ def _env_file_flags(svc: dict[str, Any], project_dir: str) -> list[Token]:
 
 
 def _nested_mount_parts(vtype: str, options: dict[str, Any]) -> list[str]:
-    """Map a long-form volume entry's validated `bind`/`volume`/`tmpfs` sub-map to `--mount` options."""
+    """Map a long-form volume entry's validated `bind`/`volume`/`tmpfs`/`image` sub-map to `--mount` options."""
     if vtype == "bind":
         parts = [f"bind-propagation={options['propagation']}"] if "propagation" in options else []
         if "selinux" in options:
             parts.append(f"relabel={'shared' if options['selinux'] == 'z' else 'private'}")
         return parts
-    if vtype == "volume":
+    if vtype in ("volume", "image"):
         return [f"subpath={options['subpath']}"] if "subpath" in options else []
-    # vtype == "tmpfs": the gate validates `type` to one of bind/volume/tmpfs, so no other branch is reachable.
+    # vtype == "tmpfs": the gate validates `type` to bind/volume/tmpfs/image, so no other branch is reachable.
     parts = [f"tmpfs-size={options['size']}"] if "size" in options else []
     if "mode" in options:
         parts.append(f"tmpfs-mode={options['mode']}")
@@ -119,7 +119,7 @@ def _mount_flag(entry: dict[str, Any], project_dir: str) -> list[Token]:
             source = str(Path(project_dir, source))
         parts.append(f"source={source}")
     parts.append(f"target={entry['target']}")
-    if as_bool(entry.get("read_only", False)):
+    if entry["type"] != "image" and as_bool(entry.get("read_only", False)):
         parts.append("ro")
     vtype = entry["type"]
     parts += _nested_mount_parts(vtype, entry.get(vtype, {}))

{compose2pod-0.3.0 → compose2pod-0.3.1}/compose2pod/parsing.py

@@ -160,7 +160,7 @@ def _classify_volume(volume: str) -> tuple[str, str | None]:
     return "bind", None
 
 
-_VOLUME_LONG_TYPES = ("bind", "volume", "tmpfs")
+_VOLUME_LONG_TYPES = ("bind", "volume", "tmpfs", "image")
 _VOLUME_LONG_KEYS = {"type", "source", "target", "read_only", "consistency"}
 # Docker's own per-type nested option map keys (measured, docker compose config
 # v5.1.2). `create_host_path`/`nocopy` are real docker keys, so they land here
@@ -171,6 +171,7 @@ _VOLUME_OPTION_KEYS = {
     "bind": {"propagation", "selinux", "create_host_path"},
     "volume": {"subpath", "nocopy"},
     "tmpfs": {"size", "mode"},
+    "image": {"subpath"},
 }
 _PROPAGATION_VALUES = {"private", "rprivate", "shared", "rshared", "slave", "rslave"}
 _SELINUX_VALUES = {"z", "Z"}
@@ -205,10 +206,11 @@ def _validate_service_volumes(name: str, svc: dict[str, Any]) -> None:
 def _validate_volume_long_form(name: str, entry: dict[str, Any]) -> None:
     """Check one long-syntax volume mapping against Docker's strict schema (measured, v5.1.2).
 
-    type (bind/volume/tmpfs), source, target, read_only, consistency, plus the
-    one nested option map matching `type` (a mismatched sub-map is refused --
-    a deliberate stricter-than-docker check; docker accepts-and-ignores it).
-    cluster/npipe/image types are refused (podman cannot express them).
+    type (bind/volume/tmpfs/image), source, target, read_only, consistency,
+    plus the one nested option map matching `type` (a mismatched sub-map is
+    refused -- a deliberate stricter-than-docker check; docker
+    accepts-and-ignores it). cluster/npipe types are refused (podman cannot
+    express them).
 
     `type` is validated before the unknown-key check (unlike every other field
     here) because the check itself needs `vtype` to know which sub-map key --
@@ -303,10 +305,26 @@ def _validate_tmpfs_options(name: str, options: dict[str, Any]) -> None:
             raise UnsupportedComposeError(msg)
 
 
+def _validate_image_options(name: str, options: dict[str, Any]) -> None:
+    """Check an image entry's nested `image:` option map (measured: strict, `subpath` only, absolute)."""
+    if "subpath" not in options:
+        return
+    subpath = options["subpath"]
+    if not isinstance(subpath, str):
+        msg = f"service {name!r}: image 'subpath' must be a string"
+        raise UnsupportedComposeError(msg)
+    if not subpath.startswith("/") and not values.has_variable(subpath):
+        # podman requires an absolute image subpath (`must be an absolute path`);
+        # docker accepts a relative one -> a rule-two narrowing. A ${VAR} is host-dependent.
+        msg = f"service {name!r}: image 'subpath' must be an absolute path"
+        raise UnsupportedComposeError(msg)
+
+
 _VOLUME_OPTION_VALIDATORS: dict[str, Callable[[str, dict[str, Any]], None]] = {
     "bind": _validate_bind_options,
     "volume": _validate_volume_type_options,
     "tmpfs": _validate_tmpfs_options,
+    "image": _validate_image_options,
 }
 
 
@@ -324,10 +342,10 @@ def _validate_volume_options(name: str, vtype: str, options: Any) -> None:  # no
 
 
 def _validate_volume_long_form_source(name: str, vtype: str, source: Any) -> None:  # noqa: ANN401 - Compose values are untyped YAML/JSON
-    """Check a long-form volume entry's 'source': required for bind, refused for tmpfs, optional string for volume."""
-    if vtype == "bind":
+    """Check a long-form volume entry's 'source': required for bind/image, refused for tmpfs, optional for volume."""
+    if vtype in ("bind", "image"):
         if not isinstance(source, str):
-            msg = f"service {name!r}: bind volume 'source' must be a string"
+            msg = f"service {name!r}: {vtype} volume 'source' must be a string"
             raise UnsupportedComposeError(msg)
     elif vtype == "tmpfs":
         if source is not None:

{compose2pod-0.3.0 → compose2pod-0.3.1}/pyproject.toml

@@ -18,7 +18,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries",
     "Topic :: Software Development :: Testing",
 ]
-version = "0.3.0"
+version = "0.3.1"
 
 [project.optional-dependencies]
 yaml = ["PyYAML>=6"]