container-magic 4.2.0__tar.gz → 4.2.2__tar.gz

{container_magic-4.2.0/src/container_magic.egg-info → container_magic-4.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: container-magic
-Version: 4.2.0
+Version: 4.2.2
 Summary: A tool for rapidly creating containerised development environments
 Author-email: Mark Hedley Jones <mark@hedleyjones.com>
 License: MIT

{container_magic-4.2.0 → container_magic-4.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "container-magic"
-version = "4.2.0"
+version = "4.2.2"
 description = "A tool for rapidly creating containerised development environments"
 authors = [
     {name = "Mark Hedley Jones", email = "mark@hedleyjones.com"}

{container_magic-4.2.0 → container_magic-4.2.2}/src/container_magic/cli/main.py

@@ -363,7 +363,14 @@ def clean():
     clean_images(config)
 
 
-@cli.command("run", context_settings=dict(ignore_unknown_options=True))
+@cli.command(
+    "run",
+    context_settings=dict(
+        ignore_unknown_options=True,
+        allow_extra_args=True,
+        help_option_names=[],
+    ),
+)
 @click.argument("args", nargs=-1, type=click.UNPROCESSED)
 def cli_run(args):
     """Run a command in the development container."""

{container_magic-4.2.0 → container_magic-4.2.2}/src/container_magic/generators/dockerfile.py

@@ -427,7 +427,18 @@ def generate_dockerfile(
 
         # Chown venv to runtime user in leaf stages so it's writable in development
         if has_user and stage_name in leaf_stages and venv_active:
-            ordered_steps.append({"type": "venv_chown"})
+            # Determine if we're in a non-root context (inherited from parent)
+            last_become_user = None
+            for s in reversed(ordered_steps):
+                if s.get("type") == "become":
+                    last_become_user = s.get("name")
+                    break
+            inherited_context = _get_parent_user_context(stage_name, stages, user_name)
+            is_root = last_become_user is None and inherited_context is None
+            chown_step = {"type": "venv_chown", "is_root": is_root}
+            if not is_root:
+                chown_step["restore_user"] = last_become_user or inherited_context
+            ordered_steps.append(chown_step)
 
         # Inject implicit become at end of leaf stages only
         # Intermediate stages stay as root so child stages inherit root context

{container_magic-4.2.0 → container_magic-4.2.2}/src/container_magic/templates/Dockerfile.j2

@@ -133,7 +133,13 @@ ENV PATH="${VIRTUAL_ENV}/bin:${PATH}"
 USER {{ step.restore_user }}
 {% endif %}
 {% elif step.type == "venv_chown" %}
+{% if not step.is_root %}
+USER root
+{% endif %}
 RUN chown -R "${USER_UID}:${USER_GID}" /opt/venv
+{% if not step.is_root %}
+USER {{ step.restore_user }}
+{% endif %}
 {% elif step.type == "custom" %}
 {% if step.command.startswith('ADD ') or step.command.startswith('ARG ') or step.command.startswith('CMD ') or step.command.startswith('COPY ') or step.command.startswith('ENTRYPOINT ') or step.command.startswith('ENV ') or step.command.startswith('EXPOSE ') or step.command.startswith('FROM ') or step.command.startswith('HEALTHCHECK ') or step.command.startswith('LABEL ') or step.command.startswith('RUN ') or step.command.startswith('SHELL ') or step.command.startswith('STOPSIGNAL ') or step.command.startswith('USER ') or step.command.startswith('VOLUME ') or step.command.startswith('WORKDIR ') %}
 {{ step.command }}

{container_magic-4.2.0 → container_magic-4.2.2/src/container_magic.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: container-magic
-Version: 4.2.0
+Version: 4.2.2
 Summary: A tool for rapidly creating containerised development environments
 Author-email: Mark Hedley Jones <mark@hedleyjones.com>
 License: MIT