compose2pod 0.3.0__tar.gz → 0.4.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compose2pod
-Version: 0.3.0
+Version: 0.4.0
 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
@@ -48,19 +48,18 @@ Convert a Docker Compose file into a POSIX `sh` script that runs its services as
 
 Built for CI and test environments where you can't use `docker compose` or `podman kube play`:
 
-- **No bridge networking / netavark.** Unprivileged CI containers often have a read-only `/proc/sys`, so netavark fails to create bridge networks. A single pod shares one network namespace with no bridge: services talk over `127.0.0.1`, and names resolve via `--add-host`.
+- **No bridge networking / netavark.** Unprivileged CI containers often have a read-only `/proc/sys`, so netavark fails to create bridge networks. A single pod shares one network namespace with no bridge: services talk over `127.0.0.1`, and names resolve via a generated `/etc/hosts` the script owns.
 - **No systemd.** Podman healthchecks are normally scheduled by systemd timers. compose2pod gates startup by polling `podman healthcheck run` directly, so `depends_on: service_healthy` works without systemd.
 - **No heavy runtime.** The core is stdlib-only — no dependencies, no compiled wheels — so it installs and runs in minimal Python images.
 
 ## Requirements
 
-**Podman >= 6.0.0.** Earlier releases have a bug where a container stopping
-inside a multi-container pod wipes `/etc/hosts` for every container in that
-pod, not just the one that stopped — fixed in 6.0.0. compose2pod's generated
-scripts rely on one shared `--add-host`-populated `/etc/hosts` for the whole
-pod (see `architecture/supported-subset.md`), so a `service_completed_successfully`
-dependency (a container that runs and exits, e.g. a migration step) can wipe
-name resolution for everything started after it on a pre-6.0.0 Podman.
+compose2pod's generated scripts own `/etc/hosts`: they write it to a temp
+file and bind-mount it read-only into every container under `--no-hosts`
+(see `architecture/supported-subset.md`), so pod-internal name resolution
+works on any Podman version. `host.containers.internal` /
+`host.docker.internal` are not provided — add an explicit `extra_hosts`
+entry if you need them.
 
 ## Install
 
@@ -83,15 +82,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.4.0}/README.md

@@ -22,19 +22,18 @@ Convert a Docker Compose file into a POSIX `sh` script that runs its services as
 
 Built for CI and test environments where you can't use `docker compose` or `podman kube play`:
 
-- **No bridge networking / netavark.** Unprivileged CI containers often have a read-only `/proc/sys`, so netavark fails to create bridge networks. A single pod shares one network namespace with no bridge: services talk over `127.0.0.1`, and names resolve via `--add-host`.
+- **No bridge networking / netavark.** Unprivileged CI containers often have a read-only `/proc/sys`, so netavark fails to create bridge networks. A single pod shares one network namespace with no bridge: services talk over `127.0.0.1`, and names resolve via a generated `/etc/hosts` the script owns.
 - **No systemd.** Podman healthchecks are normally scheduled by systemd timers. compose2pod gates startup by polling `podman healthcheck run` directly, so `depends_on: service_healthy` works without systemd.
 - **No heavy runtime.** The core is stdlib-only — no dependencies, no compiled wheels — so it installs and runs in minimal Python images.
 
 ## Requirements
 
-**Podman >= 6.0.0.** Earlier releases have a bug where a container stopping
-inside a multi-container pod wipes `/etc/hosts` for every container in that
-pod, not just the one that stopped — fixed in 6.0.0. compose2pod's generated
-scripts rely on one shared `--add-host`-populated `/etc/hosts` for the whole
-pod (see `architecture/supported-subset.md`), so a `service_completed_successfully`
-dependency (a container that runs and exits, e.g. a migration step) can wipe
-name resolution for everything started after it on a pre-6.0.0 Podman.
+compose2pod's generated scripts own `/etc/hosts`: they write it to a temp
+file and bind-mount it read-only into every container under `--no-hosts`
+(see `architecture/supported-subset.md`), so pod-internal name resolution
+works on any Podman version. `host.containers.internal` /
+`host.docker.internal` are not provided — add an explicit `extra_hosts`
+entry if you need them.
 
 ## Install
 
@@ -57,15 +56,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.4.0}/compose2pod/emit.py

@@ -12,7 +12,7 @@ from compose2pod.graph import depends_on, hostnames, startup_order
 from compose2pod.healthcheck import health_cmd, interval_seconds
 from compose2pod.keys import SERVICE_KEYS, Expand, GuardedEnvFile, Token
 from compose2pod.parsing import validate
-from compose2pod.pod import pod_create_flags
+from compose2pod.pod import hosts_file_tokens, pod_create_flags
 from compose2pod.resources import deploy_resource_flags
 from compose2pod.shell import to_shell, variable_names
 from compose2pod.values import as_bool
@@ -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, {}))
@@ -161,23 +161,16 @@ def run_flags(name: str, svc: dict[str, Any], pod: str, project_dir: str) -> lis
     return flags
 
 
+# Every container mounts the script-owned /etc/hosts read-only. `--no-hosts`
+# stops podman managing the file (so the pre-6.0.0 stop-wipe never runs); `z`
+# relabels for SELinux (mandatory on Fedora, a no-op elsewhere).
+_HOSTS_MOUNT = '--no-hosts -v "$hostsfile":/etc/hosts:ro,z'
+
 _SCRIPT_HEADER = """\
 #!/bin/sh
 # Generated by compose2pod -- do not edit, regenerate instead.
 set -eu
 
-podman_version=$(podman version --format '{{.Client.Version}}' 2>/dev/null) || podman_version="unknown"
-podman_major=$(echo "$podman_version" | cut -d. -f1)
-case "$podman_major" in
-  ''|*[!0-9]*) ;;  # unparseable -- skip rather than false-positive
-  *) if [ "$podman_major" -lt 6 ]; then
-       echo "warning: podman $podman_version detected; compose2pod requires podman >= 6.0.0" >&2
-       echo "warning: podman < 6.0.0 has a bug where a container stopping in a multi-container" >&2
-       echo "pod wipes /etc/hosts for the whole pod (fixed in 6.0.0) -- name resolution between" >&2
-       echo "services may fail unpredictably" >&2
-     fi ;;
-esac
-
 wait_healthy() {
   ctr=$1
   attempts=$2
@@ -277,7 +270,7 @@ def _emit_target(lines: list[str], tokens: list[Token], options: EmitOptions) ->
     target_ctr = shlex.quote(f"{options.pod}-{options.target}")
     lines.append("rc=0")
     lines.extend(_env_file_preludes(tokens))
-    lines.append(f"podman run {_render(tokens)} || rc=$?")
+    lines.append(f"podman run {_HOSTS_MOUNT} {_render(tokens)} || rc=$?")
     for artifact in options.artifacts:
         source, destination = artifact.split(":", 1)
         lines.append(f"podman cp {target_ctr}:{shlex.quote(source)} {shlex.quote(destination)} || true")
@@ -343,6 +336,7 @@ def _plan(compose: dict[str, Any], options: EmitOptions) -> PlannedScript:
     # pointing at 127.0.0.1 for a service that never runs would turn an honest
     # resolution failure into a connection-refused.
     hosts = hostnames({name: services[name] for name in order})
+    host_tokens = hosts_file_tokens(services, order, hosts)
     completion_gated = {
         dep
         for svc in services.values()
@@ -352,17 +346,21 @@ def _plan(compose: dict[str, Any], options: EmitOptions) -> PlannedScript:
     names: set[str] = set()
 
     lines = [_SCRIPT_HEADER]
+    lines.append("hostsfile=$(mktemp)")
     teardown = f"podman pod rm -f {shlex.quote(options.pod)} >/dev/null 2>&1 || true"
     store_teardown = stores.teardown_line(compose, order, options.pod)
     if store_teardown:
         teardown += f"; {store_teardown}"
+    teardown += '; rm -f "$hostsfile"'
     lines.append(f"trap '{teardown}' EXIT")
-    pod_flags = pod_create_flags(services, order, hosts)
+    pod_flags = pod_create_flags(services, order)
     _collect_vars(pod_flags, names)
-    pod_create = f"podman pod create --name {shlex.quote(options.pod)}"
+    pod_create = f"podman pod create --name {shlex.quote(options.pod)} --no-hosts"
     if pod_flags:
         pod_create += " " + _render(pod_flags)
     lines.append(pod_create)
+    _collect_vars(host_tokens, names)
+    lines.append(f"printf '%s\\n' {_render(host_tokens)} > \"$hostsfile\"")
     lines.extend(stores.create_lines(compose, order, options.pod, options.project_dir))
     names |= stores.referenced_variables(compose, order, options.project_dir)
     waited: set[str] = set()
@@ -379,10 +377,10 @@ def _plan(compose: dict[str, Any], options: EmitOptions) -> PlannedScript:
             _emit_target(lines, tokens, options)
         elif name in completion_gated:
             lines.extend(_env_file_preludes(tokens))
-            lines.append(f"podman run --rm {_render(tokens)}")
+            lines.append(f"podman run --rm {_HOSTS_MOUNT} {_render(tokens)}")
         else:
             lines.extend(_env_file_preludes(tokens))
-            lines.append(f"podman run -d {_render(tokens)}")
+            lines.append(f"podman run -d {_HOSTS_MOUNT} {_render(tokens)}")
     return PlannedScript(script="\n".join(lines) + "\n", variables=sorted(names))
 
 

{compose2pod-0.3.0 → compose2pod-0.4.0}/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.4.0}/compose2pod/pod.py

@@ -47,8 +47,8 @@ def _check_extra_host_separators(name: str, value: Any) -> None:  # noqa: ANN401
     """Check each list-form entry actually divides into a host and an address.
 
     An entry with neither separator has no address to emit, and would render as
-    a malformed `--add-host "no-separator:"`. The mapping form cannot have this
-    problem: its key and value are already separate.
+    a malformed hosts-file line (a name with no address). The mapping form cannot
+    have this problem: its key and value are already separate.
     """
     if not isinstance(value, list):
         return
@@ -65,7 +65,7 @@ def _check_extra_host_value_types(name: str, value: Any) -> None:  # noqa: ANN40
     number, boolean, or null -- correct for `labels`/`annotations`' bare-key-
     means-null semantics, but too loose for `extra_hosts`: an int/bool/null
     address would otherwise reach `keys.extra_host_entries` and get coerced
-    into a bogus `--add-host` value. Measured against `docker compose config`
+    into a bogus hosts-file line. Measured against `docker compose config`
     v5.1.2: `extra_hosts: {h: 3}` and `extra_hosts: {h: true}` are both
     refused ("services.<svc>.extra_hosts.h must be a string"). The list form
     cannot have this problem: `validate_map` already requires every list
@@ -131,14 +131,19 @@ def _sysctl_flags(services: dict[str, Any], order: list[str]) -> list[Token]:
     return tokens
 
 
-def _add_host_flags(services: dict[str, Any], order: list[str], hosts: list[str]) -> list[Token]:
-    """Merge alias/hostname hosts (fixed 127.0.0.1) with extra_hosts (order-scoped) into one add-host set.
+_LOCALHOST_LINES: tuple[str, str] = ("127.0.0.1 localhost", "::1 localhost")
 
-    A host name landing on two different addresses -- across services' extra_hosts,
-    or against an alias's fixed 127.0.0.1 -- is refused rather than guessed at, matching
-    the sysctls conflict rule below. Alias entries render as plain tokens (unquoted, as
-    before this move); extra_hosts entries render via `Expand` (as before, quoted/interpolated)
-    -- relocating the flags changes nothing else observable about either source.
+
+def hosts_file_tokens(services: dict[str, Any], order: list[str], hosts: list[str]) -> list[Token]:
+    """Render the pod's /etc/hosts as `IP NAME` line tokens (localhost lines first).
+
+    compose2pod owns /etc/hosts: the generated script bind-mounts these lines
+    into every container under `--no-hosts`, replacing the former pod-level
+    `--add-host` set (which conflicts with `--no-hosts`). Merge/conflict rules
+    are unchanged from the add-host era: alias/hostname names are fixed at
+    127.0.0.1, `extra_hosts` is order-scoped, and a name landing on two
+    addresses is refused. Alias lines are literal tokens; `extra_hosts` lines
+    render via `Expand` so a `${VAR}` address stays live at run time.
     """
     merged: dict[str, str] = {}
     from_extra_hosts: set[str] = set()
@@ -154,18 +159,19 @@ def _add_host_flags(services: dict[str, Any], order: list[str], hosts: list[str]
                 raise UnsupportedComposeError(msg)
             merged[host] = addr
             from_extra_hosts.add(host)
-    tokens: list[Token] = []
+    tokens: list[Token] = [*_LOCALHOST_LINES]
     for host, addr in merged.items():
-        value = Expand(value=f"{host}:{addr}") if host in from_extra_hosts else f"{host}:{addr}"
-        tokens += ["--add-host", value]
+        line = f"{addr} {host}"
+        tokens.append(Expand(value=line) if host in from_extra_hosts else line)
     return tokens
 
 
-def pod_create_flags(services: dict[str, Any], order: list[str], hosts: list[str]) -> list[Token]:
-    """Pod-create flag tokens aggregated across the closure `order`, plus `hosts` for add-host.
+def pod_create_flags(services: dict[str, Any], order: list[str]) -> list[Token]:
+    """Pod-create flag tokens aggregated across the closure `order`.
 
-    Add-host is merged from alias/hostname resolution (`hosts`, fixed 127.0.0.1) and each
-    closure service's `extra_hosts`, conflict-checked (see `_add_host_flags`). dns/dns_search/
-    dns_opt are unioned (dedup, first-seen order); sysctls are unioned by key.
+    dns/dns_search/dns_opt are unioned (dedup, first-seen order); sysctls are
+    unioned by key. Name resolution no longer rides on `--add-host` (it conflicts
+    with the `--no-hosts` the script now passes); it lives in the bind-mounted
+    hosts file -- see `hosts_file_tokens`.
     """
-    return _add_host_flags(services, order, hosts) + _dns_flags(services, order) + _sysctl_flags(services, order)
+    return _dns_flags(services, order) + _sysctl_flags(services, order)

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

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