omdev 0.0.15__tar.gz → 0.0.16__tar.gz

{omdev-0.0.15/omdev.egg-info → omdev-0.0.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.15
+Version: 0.0.16
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,10 +14,10 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.15
+Requires-Dist: omlish==0.0.16
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.15; extra == "all"
-Requires-Dist: ommlds==0.0.15; extra == "all"
+Requires-Dist: ominfra==0.0.16; extra == "all"
+Requires-Dist: ommlds==0.0.16; extra == "all"
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -33,9 +33,9 @@ Requires-Dist: textual~=8.2; extra == "all"
 Requires-Dist: textual-dev~=1.8; extra == "all"
 Requires-Dist: textual-speedups~=0.2; extra == "all"
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.15; extra == "ominfra"
+Requires-Dist: ominfra==0.0.16; extra == "ominfra"
 Provides-Extra: ommlds
-Requires-Dist: ommlds==0.0.15; extra == "ommlds"
+Requires-Dist: ommlds==0.0.16; extra == "ommlds"
 Provides-Extra: black
 Requires-Dist: black~=26.3; extra == "black"
 Provides-Extra: c

{omdev-0.0.15 → omdev-0.0.16}/omdev/.omlish-manifests.json

@@ -39,7 +39,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 322,
+    "line": 323,
     "value": {
       "!.cli.types.CliModule": {
         "name": "cli",

{omdev-0.0.15 → omdev-0.0.16}/omdev/cli/clicli.py

@@ -75,6 +75,7 @@ class CliCli(ap.Cli):
     @ap.cmd(
         ap.arg('args', nargs=ap.REMAINDER),
         name='python',
+        aliases=['py'],
         accepts_unknown=True,
     )
     def python_cmd(self) -> None:

{omdev-0.0.15 → omdev-0.0.16}/omdev/dockerdev/cli.py

@@ -30,8 +30,11 @@ try:
 finally:
     subprocess.check_call(['docker', 'image', 'rm', tag], stdout=subprocess.DEVNULL)
 """
+import os
+import sys
 import tomllib
 
+from omlish import check
 from omlish import lang
 from omlish import marshal as msh
 from omlish.argparse import all as ap
@@ -94,10 +97,21 @@ class Cli(ap.Cli):
 
         ap.arg('-X', '--x11', action='store_true'),
 
+        ap.arg('--shift-uid'),
+        ap.arg('-U', '--auto-shift-uid', action='store_true'),
+
         ap.arg('args', nargs=ap.REMAINDER),
         accepts_unknown=True,
     )
     def run(self) -> None:
+        shift_uid: tuple[int, int] | None = None
+        if (su := self.args.shift_uid) is not None:
+            check.arg(not self.args.auto_shift_uid)
+            shift_uid = tuple(map(int, su.split(':')))  # type: ignore[assignment]
+        elif self.args.auto_shift_uid:
+            if getattr(sys, 'platform') == 'linux':
+                shift_uid = (os.getuid(), os.getgid())
+
         run_image(
             self._load_config(),
 
@@ -119,6 +133,8 @@ class Cli(ap.Cli):
 
                 x11=bool(self.args.x11),
 
+                shift_uid=shift_uid,
+
                 unknown_args=self.unknown_args,
                 extra_args=self.args.args,
             ),

{omdev-0.0.15 → omdev-0.0.16}/omdev/dockerdev/gen.py

@@ -171,7 +171,7 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
     ]))
 
     ops.append(Section('scripts', [
-        Run(f'mkdir {home}/scripts ;'),
+        Run(f'mkdir {home}/scripts && chmod -R g=u {home}/scripts ;'),
         *[
             Write(f'{home}/scripts/{n}', r.read_text())
             for n, r in sorted(lang.get_relative_resources('resources.scripts', globals=globals()).items())

{omdev-0.0.15 → omdev-0.0.16}/omdev/dockerdev/rendering.py

@@ -219,23 +219,23 @@ def render_copy(op: Copy, ctx: RenderContext) -> str:
 def render_write(op: Write, ctx: RenderContext) -> str:
     out = io.StringIO()
 
-    out.write("RUN echo '\\\n")
-
     c = render_content(op.content, ctx)
-    s = sh_quote(c)[1:-1]
-    for l in s.splitlines(keepends=True):
-        # l = l.replace('$', '\\$')
-        if l.endswith('\n'):
-            out.write(l[:-1])
-            out.write('\\n\\\n')
-        else:
-            out.write(l)
-            out.write('\\\n')
-
-    last = f"' {'>>' if op.append else '>'} {op.path}"
+
+    eof = 'EOF'
+    ei = 0
+    while eof in c:
+        eof = f'EOF{ei}'
+        ei += 1
+
+    out.write(f"RUN cat {'>>' if op.append else '>'} {op.path} <<'{eof}'")
     if ctx.write_chmod is not None:
-        last += f' && chmod {ctx.write_chmod} {op.path}'
-    out.write(last)
+        out.write(f' && chmod {ctx.write_chmod} {op.path}')
+
+    out.write('\n')
+    out.write(c.strip())
+    out.write('\n')
+    out.write(eof)
+    out.write('\n')
 
     return out.getvalue()
 

omdev-0.0.16/omdev/dockerdev/resources/shift-uid.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+set -eu
+
+INTERNAL_UID=$(id -u "$SHIFTUID_INTERNAL_USER")
+
+if [ "$SHIFTUID_EXTERNAL_UID" != "$INTERNAL_UID" ]; then
+  # 1. Evict any existing user squatting on our target UID
+  CONFLICT_USER=$(getent passwd "$SHIFTUID_EXTERNAL_UID" | cut -d: -f1)
+  if [ -n "$CONFLICT_USER" ] && [ "$CONFLICT_USER" != "$SHIFTUID_INTERNAL_USER" ]; then
+      userdel "$CONFLICT_USER"
+  fi
+
+  # 2. Ensure the target group exists
+  getent group "$SHIFTUID_EXTERNAL_GID" >/dev/null 2>&1 || groupadd -g "$SHIFTUID_EXTERNAL_GID" shift-uid
+
+  # 3. Temporarily point home dir away to bypass the automatic large chown
+  INTERNAL_HOME=$(getent passwd "$SHIFTUID_INTERNAL_USER" | cut -d: -f6)
+  usermod -d /tmp "$SHIFTUID_INTERNAL_USER"
+
+  # 4. Shift user's primary UID and GID to match the host, keeping original group
+  usermod -u "$SHIFTUID_EXTERNAL_UID" -g "$SHIFTUID_EXTERNAL_GID" -aG "$INTERNAL_UID" "$SHIFTUID_INTERNAL_USER"
+
+  # 5. Point the home directory back
+  usermod -d "$INTERNAL_HOME" "$SHIFTUID_INTERNAL_USER"
+fi
+
+_INTERNAL_USER="$SHIFTUID_INTERNAL_USER"
+_INTERNAL_ENTRYPOINT="$SHIFTUID_INTERNAL_ENTRYPOINT"
+
+unset SHIFTUID_EXTERNAL_UID
+unset SHIFTUID_EXTERNAL_GID
+unset SHIFTUID_INTERNAL_USER
+unset SHIFTUID_INTERNAL_ENTRYPOINT
+
+exec gosu "$_INTERNAL_USER" $_INTERNAL_ENTRYPOINT $@

{omdev-0.0.15 → omdev-0.0.16}/omdev/dockerdev/run.py

@@ -1,29 +1,44 @@
 """
 ====
 
-./om dockerdev run -CG --user=0:0 --env=TARGET_UID=1000 --env=TARGET_GID=1000 --rm -it bash
+./om dockerdev run -CG \
+    --user=0:0 \
+    --env=EXTERNAL_UID=1000 \
+    --env=EXTERNAL_GID=1000 \
+    --env=INTERNAL_USER=omlish \
+    --rm -it bash
 
-if [ "$TARGET_UID" != "0" ] && [ "$TARGET_UID" != "$(id -u omlish)" ]; then
+====
+
+INTERNAL_UID=$(id -u "$INTERNAL_USER")
+
+if [ "$EXTERNAL_UID" != "$INTERNAL_UID" ]; then
   # 1. Evict any existing user squatting on our target UID
-  CONFLICT_USER=$(getent passwd "$TARGET_UID" | cut -d: -f1)
-  if [ -n "$CONFLICT_USER" ] && [ "$CONFLICT_USER" != "omlish" ]; then
+  CONFLICT_USER=$(getent passwd "$EXTERNAL_UID" | cut -d: -f1)
+  if [ -n "$CONFLICT_USER" ] && [ "$CONFLICT_USER" != "$INTERNAL_USER" ]; then
       userdel "$CONFLICT_USER"
   fi
 
   # 2. Ensure the target group exists
-  getent group "$TARGET_GID" >/dev/null 2>&1 || groupadd -g "$TARGET_GID" hostgroup
+  getent group "$EXTERNAL_GID" >/dev/null 2>&1 || groupadd -g "$EXTERNAL_GID" shift-uid
 
   # 3. DECOY: Temporarily point home dir away to bypass the automatic large chown
-  usermod -d /tmp omlish
+  INTERNAL_HOME=$(getent passwd "$INTERNAL_USER" | cut -d: -f6)
+  usermod -d /tmp "$INTERNAL_USER"
 
-  # 4. Shift omlish's primary UID and GID to match the host, keeping original group
-  usermod -u "$TARGET_UID" -g "$TARGET_GID" -aG 4317 omlish
+  # 4. Shift user's primary UID and GID to match the host, keeping original group
+  usermod -u "$EXTERNAL_UID" -g "$EXTERNAL_GID" -aG "$INTERNAL_UID" "$INTERNAL_USER"
 
-  # 5. RESTORE: Point the home directory back
-  usermod -d /omlish omlish
+  # 5. Point the home directory back
+  usermod -d "$INTERNAL_HOME" "$INTERNAL_USER"
 fi
 
-# TODO: unset TARGET_UID, TARGET_GID, dynamically get 4317/'omlish'
+unset EXTERNAL_UID
+unset EXTERNAL_GID
+unset INTERNAL_USER
+
+unset INTERNAL_UID
+unset INTERNAL_HOME
 
 exec gosu omlish bash  # "$@"
 """
@@ -36,6 +51,7 @@ import typing as ta
 
 from omlish import check
 from omlish import dataclasses as dc
+from omlish import lang
 from omlish.os.paths import is_path_in_dir
 
 from ..home.paths import get_cache_dir
@@ -65,10 +81,17 @@ class RunArgs:
 
     x11: bool = False
 
+    no_default_labels: bool = False
+
+    shift_uid: tuple[int, int] | None = None
+
     unknown_args: ta.Sequence[str] | None = None
     extra_args: ta.Sequence[str] | None = None
 
 
+LABEL_PREFIX = 'omlish.dockerdev'
+
+
 def process_run_args(
         cfg: Config,
         args: RunArgs,
@@ -112,9 +135,18 @@ def process_run_args(
     if not args.no_host_platform:
         run_args.extend([f'--env=DOCKER_HOST_PLATFORM={platform.system().lower()}'])
 
+    @lang.cached_function
+    def tmp_dir() -> str:
+        d = tempfile.mkdtemp()
+        run_args.extend([
+            f'--mount=type=bind,src={d},dst=/dockerdev,readonly',
+        ])
+        return d
+
+    entrypoint: str | None = None
+
     if args.autoexecs:
-        tmp_dir = tempfile.mkdtemp()
-        tmp_ep = os.path.join(tmp_dir, 'entrypoint.sh')
+        tmp_ep = os.path.join(tmp_dir(), 'autoexec.sh')
         with open(tmp_ep, 'w') as f:
             f.write('\n'.join([
                 '#!/bin/sh',
@@ -123,16 +155,38 @@ def process_run_args(
                 'exec "$@"',
             ]))
         os.chmod(tmp_ep, 0o755)  # noqa
+        entrypoint = '/dockerdev/autoexec.sh'
+
+    if args.shift_uid is not None:
+        su_uid, su_gid = args.shift_uid
+        su_src = lang.get_relative_resources('.resources', globals=globals())['shift-uid.sh'].read_text()
+        tmp_su_ep = os.path.join(tmp_dir(), 'shift-uid.sh')
+        with open(tmp_su_ep, 'w') as f:
+            f.write(su_src)
+        os.chmod(tmp_su_ep, 0o755)  # noqa
+        run_args.extend([
+            '--user=0:0',
+        ])
         run_args.extend([
-            f'--mount=type=bind,src={tmp_dir},dst=/dockerdev,readonly',
-            f'--entrypoint=/dockerdev/entrypoint.sh',
+            f'--env={k}={v}' for k, v in {
+                'SHIFTUID_EXTERNAL_UID': str(su_uid),
+                'SHIFTUID_EXTERNAL_GID': str(su_gid),
+                'SHIFTUID_INTERNAL_USER': check.non_empty_str(cfg.user),
+                'SHIFTUID_INTERNAL_ENTRYPOINT': entrypoint or '',
+            }.items()
+        ])
+        entrypoint = '/dockerdev/shift-uid.sh'
+
+    if entrypoint is not None:
+        run_args.extend([
+            f'--entrypoint={entrypoint}',
         ])
 
     if args.x11:
         sys_platform = getattr(sys, 'platform')  # shuts up mypy
         if sys_platform.startswith('linux'):
             run_args.extend([
-                f'--env=DISPLAY',
+                '--env=DISPLAY',
                 '--volume=/tmp/.X11-unix:/tmp/.X11-unix:rw',
                 f'--volume={os.environ["HOME"]}/.Xauthority:/tmp/.Xauthority:ro',
                 '--env=XAUTHORITY=/tmp/.Xauthority',
@@ -144,6 +198,9 @@ def process_run_args(
         else:
             raise OSError(sys_platform)
 
+    if not args.no_default_labels:
+        run_args.append(f'--label={LABEL_PREFIX}')
+
     run_args.append(sha)
 
     if args.extra_args:

{omdev-0.0.15 → omdev-0.0.16/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.15
+Version: 0.0.16
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,10 +14,10 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.15
+Requires-Dist: omlish==0.0.16
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.15; extra == "all"
-Requires-Dist: ommlds==0.0.15; extra == "all"
+Requires-Dist: ominfra==0.0.16; extra == "all"
+Requires-Dist: ommlds==0.0.16; extra == "all"
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -33,9 +33,9 @@ Requires-Dist: textual~=8.2; extra == "all"
 Requires-Dist: textual-dev~=1.8; extra == "all"
 Requires-Dist: textual-speedups~=0.2; extra == "all"
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.15; extra == "ominfra"
+Requires-Dist: ominfra==0.0.16; extra == "ominfra"
 Provides-Extra: ommlds
-Requires-Dist: ommlds==0.0.15; extra == "ommlds"
+Requires-Dist: ommlds==0.0.16; extra == "ommlds"
 Provides-Extra: black
 Requires-Dist: black~=26.3; extra == "black"
 Provides-Extra: c

{omdev-0.0.15 → omdev-0.0.16}/omdev.egg-info/SOURCES.txt

@@ -176,6 +176,7 @@ omdev/dockerdev/rendering.py
 omdev/dockerdev/run.py
 omdev/dockerdev/utils.py
 omdev/dockerdev/resources/.python-versions.json
+omdev/dockerdev/resources/shift-uid.sh
 omdev/dockerdev/resources/configs/.gdbinit
 omdev/dockerdev/resources/configs/.sqliterc
 omdev/dockerdev/resources/configs/.tmux.conf

{omdev-0.0.15 → omdev-0.0.16}/omdev.egg-info/requires.txt

@@ -1,8 +1,8 @@
-omlish==0.0.15
+omlish==0.0.16
 
 [all]
-ominfra==0.0.15
-ommlds==0.0.15
+ominfra==0.0.16
+ommlds==0.0.16
 black~=26.3
 pycparser~=3.0
 pcpp~=1.30
@@ -35,10 +35,10 @@ pygments~=2.20
 mypy~=1.20
 
 [ominfra]
-ominfra==0.0.15
+ominfra==0.0.16
 
 [ommlds]
-ommlds==0.0.15
+ommlds==0.0.16
 
 [prof]
 gprof2dot~=2025.4

{omdev-0.0.15 → omdev-0.0.16}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.14'
-version = '0.0.15'
+version = '0.0.16'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,13 +24,13 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.15',
+    'omlish == 0.0.16',
 ]
 
 [project.optional-dependencies]
 all = [
-    'ominfra == 0.0.15',
-    'ommlds == 0.0.15',
+    'ominfra == 0.0.16',
+    'ommlds == 0.0.16',
     'black ~= 26.3',
     'pycparser ~= 3.0',
     'pcpp ~= 1.30',
@@ -47,10 +47,10 @@ all = [
     'textual-speedups ~= 0.2',
 ]
 ominfra = [
-    'ominfra == 0.0.15',
+    'ominfra == 0.0.16',
 ]
 ommlds = [
-    'ommlds == 0.0.15',
+    'ommlds == 0.0.16',
 ]
 black = [
     'black ~= 26.3',
@@ -119,6 +119,7 @@ exclude = [
 ]
 'omdev.dockerdev' = [
     'config.toml',
+    'resources/*',
     'resources/.*',
     'resources/configs/.*',
     'resources/depsets/*',