omdev 0.0.0.dev547__tar.gz → 0.0.0.dev549__tar.gz

{omdev-0.0.0.dev547/omdev.egg-info → omdev-0.0.0.dev549}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev547
+Version: 0.0.0.dev549
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev547
+Requires-Dist: omlish==0.0.0.dev549
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev547 → omdev-0.0.0.dev549}/omdev/dockerdev/cli.py

@@ -29,6 +29,7 @@ import shutil
 import subprocess
 import sys
 import tempfile
+import time
 import tomllib
 import typing as ta
 
@@ -118,41 +119,50 @@ class Cli(ap.Cli):
         insp_out_obj = json.loads(insp_out)
         insp_out_dct = check.not_empty(insp_out_obj)[0]
 
-        obi = check.non_empty_str(insp_out_dct['RepoDigests'][0])
-        cfg = dc.replace(cfg, base_image=obi)
+        obi = check.non_empty_str(insp_out_dct['Id'])
 
-        #
+        tag = f'omlish-dockerdev--{time.time_ns()}--{os.getpid()}'
 
-        src = gen_src(cfg)
+        subprocess.check_call(['docker', 'tag', obi, tag])
 
-        tmp_dir = tempfile.mkdtemp()
-        df = os.path.join(tmp_dir, 'Dockerfile')
-        with open(df, 'w') as f:
-            f.write(src)
+        try:
+            cfg = dc.replace(cfg, base_image=tag)  # noqa
 
-        build_args = [
-            '-f',
-            df,
-        ]
+            #
 
-        if offline:
-            build_args.append('--pull=false')
+            src = gen_src(cfg)
 
-        build_args.append('.')
+            tmp_dir = tempfile.mkdtemp()
+            df = os.path.join(tmp_dir, 'Dockerfile')
+            with open(df, 'w') as f:
+                f.write(src)
 
-        if not verbose:
-            out = subprocess.check_output(['docker', 'build', '-q', *build_args]).decode()
-            if (m := SHA_PAT.search(out)) is not None:
-                return m.group(0)
-            raise RuntimeError('Can\'t find sha256 in output')
+            build_args = [
+                '-f',
+                df,
+            ]
 
-        else:
-            proc, out = run_and_tee(['docker', 'build', *build_args])
-            check.state(proc.returncode == 0)
-            for line in reversed(out.splitlines()):
-                if (m := SHA_PAT.search(line)) is not None:
+            if offline:
+                build_args.append('--pull=false')
+
+            build_args.append('.')
+
+            if not verbose:
+                out = subprocess.check_output(['docker', 'build', '-q', *build_args]).decode()
+                if (m := SHA_PAT.search(out)) is not None:
                     return m.group(0)
-            raise RuntimeError('Can\'t find sha256 in output')
+                raise RuntimeError("Can't find sha256 in output")
+
+            else:
+                proc, out = run_and_tee(['docker', 'build', *build_args])
+                check.state(proc.returncode == 0)
+                for line in reversed(out.splitlines()):
+                    if (m := SHA_PAT.search(line)) is not None:
+                        return m.group(0)
+                raise RuntimeError("Can't find sha256 in output")
+
+        finally:
+            subprocess.check_call(['docker', 'image', 'rm', tag], stdout=subprocess.DEVNULL)
 
     @ap.cmd(
         ap.arg('-v', '--verbose', action='store_true'),
@@ -180,6 +190,8 @@ class Cli(ap.Cli):
 
         ap.arg('-x', '--autoexec', action='append'),
 
+        ap.arg('-X', '--x11', action='store_true'),
+
         ap.arg('args', nargs=ap.REMAINDER),
         accepts_unknown=True,
     )
@@ -245,6 +257,22 @@ class Cli(ap.Cli):
                 f'--entrypoint=/dockerdev/entrypoint.sh',
             ])
 
+        if self.args.x11:
+            sys_platform = getattr(sys, 'platform')  # shuts up mypy
+            if sys_platform.startswith('linux'):
+                run_args.extend([
+                    f'--env=DISPLAY',
+                    '--volume=/tmp/.X11-unix:/tmp/.X11-unix:rw',
+                    f'--volume={os.environ["HOME"]}/.Xauthority:/tmp/.Xauthority:ro',
+                    '--env=XAUTHORITY=/tmp/.Xauthority',
+                ])
+            elif sys_platform == 'darwin':
+                run_args.extend([
+                    '--env=DISPLAY=host.docker.internal:0',
+                ])
+            else:
+                raise OSError(sys_platform)
+
         run_args.append(sha)
 
         if self.args.args:

{omdev-0.0.0.dev547 → omdev-0.0.0.dev549}/omdev/dockerdev/config.py

@@ -10,6 +10,10 @@ from omlish import dataclasses as dc
 class Config:
     base_image: str
 
+    user: str | None = None
+    uid: int = 2000
+    gid: int = 2000
+
     workdir: str | None = None
 
     _: dc.KW_ONLY
@@ -18,10 +22,6 @@ class Config:
 
     jdks: ta.Sequence[str] | None = None
 
-    go_version: str | None = None
-
-    zig_version: str | None = None
-
     nvm_versions: ta.Sequence[str] | None = None
 
     rbenv_versions: ta.Sequence[str] | None = None
@@ -30,6 +30,4 @@ class Config:
 
     pyenv_version_keys: ta.Sequence[str] | None = None
 
-    config_files: ta.Sequence[str] | None = None
-
     cache_mounts: ta.Mapping[str, str] | None = None

{omdev-0.0.0.dev547 → omdev-0.0.0.dev549}/omdev/dockerdev/config.toml

@@ -1,5 +1,7 @@
 base_image = 'ubuntu:24.04'
 
+user = 'omlish'
+
 dep_sets = [
     'system',
     'python',
@@ -12,10 +14,6 @@ jdks = [
     'zulu26-ca-jdk',
 ]
 
-go_version = '1.26.1'
-
-zig_version = '0.15.2'
-
 nvm_versions = [
     '20',
     '22',
@@ -38,14 +36,8 @@ pyenv_version_keys = [
     '14',
 ]
 
-config_files = [
-    '.gdbinit',
-    '.tmux.conf',
-    '.vimrc',
-]
-
-workdir = '/omlish'
+workdir = '/work'
 
 [cache_mounts]
-'pip' = '/root/.cache/pip'
-'uv' = '/root/.cache/uv'
+'pip' = '/omlish/.cache/pip'
+'uv' = '/omlish/.cache/uv'

{omdev-0.0.0.dev547 → omdev-0.0.0.dev549}/omdev/dockerdev/gen.py

@@ -6,9 +6,12 @@ TODO:
 import io
 import typing as ta
 
+from omlish import lang
+
 from .config import Config
 from .content import LazyContent
 from .content import Resource
+from .content import WithStaticEnv
 from .helpers import APT_CACHE_MOUNTS
 from .helpers import fragment_section
 from .helpers import read_versions_file_versions
@@ -20,6 +23,7 @@ from .ops import From
 from .ops import Op
 from .ops import Run
 from .ops import Section
+from .ops import User
 from .ops import Workdir
 from .ops import Write
 from .rendering import render_op
@@ -37,6 +41,8 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
     #     Copy(src='docker/.timestamp', dst='/'),
     # ]))
 
+    home = f'/{cfg.user or "root"}'
+
     ops.append(Section('locale', [
         Env([
             ('LANG', 'en_US.UTF-8'),
@@ -45,6 +51,9 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
         ]),
     ]))
 
+    ##
+    # apt
+
     ops.append(Section('deps', [
         Run(
             [
@@ -55,6 +64,21 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
         ),
     ]))
 
+    if cfg.user is not None:
+        ops.append(Section('user', [
+            Run(
+                WithStaticEnv(
+                    Resource('fragments/user.sh'),
+                    {
+                        'NEWUSER': cfg.user,
+                        'NEWUID': str(cfg.uid),
+                        'NEWGID': str(cfg.gid),
+                    },
+                ),
+            ),
+            User(cfg.user),
+        ]))
+
     ops.append(fragment_section(
         'firefox',
         cache_mounts=APT_CACHE_MOUNTS,
@@ -65,71 +89,74 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
         cache_mounts=APT_CACHE_MOUNTS,
     ))
 
-    if cfg.jdks:
-        ops.append(fragment_section(
-            'jdk',
-            static_env={'JDKS': cfg.jdks},
-            cache_mounts=APT_CACHE_MOUNTS,
-        ))
+    ops.append(fragment_section(
+        'jdk',
+        static_env={'JDKS': cfg.jdks or []},
+        cache_mounts=APT_CACHE_MOUNTS,
+    ))
+
+    ops.append(fragment_section('man'))
+
+    ##
+    # langs
 
     ops.append(fragment_section('rust'))
 
-    if cfg.go_version is not None:
-        ops.append(fragment_section(
-            'go',
-            static_env={'GO_VERSION': cfg.go_version},
-        ))
+    ops.append(fragment_section('go'))
 
-    if cfg.zig_version is not None:
-        ops.append(fragment_section(
-            'zig',
-            static_env={'ZIG_VERSION': cfg.zig_version},
-        ))
+    ops.append(fragment_section('zig'))
 
     ops.append(fragment_section('vcpkg'))
 
-    if cfg.nvm_versions:
-        ops.append(fragment_section(
-            'nvm',
-            static_env={'NVM_VERSIONS': cfg.nvm_versions},
-        ))
+    ops.append(fragment_section(
+        'nvm',
+        static_env={'NVM_VERSIONS': cfg.nvm_versions or []},
+    ))
 
-    if cfg.rbenv_versions:
-        ops.append(fragment_section(
-            'rbenv',
-            static_env={'RBENV_VERSIONS': cfg.rbenv_versions},
-        ))
+    ops.append(fragment_section(
+        'rbenv',
+        static_env={'RBENV_VERSIONS': cfg.rbenv_versions or []},
+    ))
 
     ops.append(fragment_section(
         'uv',
         static_env={'UV_PYTHON_VERSIONS': cfg.uv_python_versions or []},
     ))
 
-    if cfg.pyenv_version_keys:
-        ops.append(fragment_section(
-            'pyenv',
-            static_env=lambda: {
-                'PYENV_VERSIONS': list(read_versions_file_versions(
-                    'resources',
-                    '.python-versions.json',
-                    cfg.pyenv_version_keys,
-                ).values()),
-            },
-            cache_mounts=['/root/.pyenv_cache'],
-        ))
+    ops.append(fragment_section(
+        'pyenv',
+        static_env=lambda: {
+            'PYENV_VERSIONS': list(read_versions_file_versions(
+                'resources',
+                '.python-versions.json',
+                cfg.pyenv_version_keys or [],
+            ).values()),
+        },
+        cache_mounts=[f'{home}/.pyenv_cache'],
+        cache_mount_args=[f'uid={cfg.uid}', f'gid={cfg.gid}'],
+    ))
+
+    ##
+    # config
 
     ops.append(fragment_section('sshd'))
 
-    # ops.append(Section('x11', [
-    #     Run('touch /root/.Xauthority'),
-    #     Write('/root/xu', Resource('xu')),
-    # ]))
+    ops.append(Section('configs', [
+        Write(f'{home}/{n}', r.read_text())
+        for n, r in sorted(lang.get_relative_resources('resources.configs', globals=globals()).items())
+        if r.is_file
+    ]))
 
-    if cfg.config_files:
-        ops.append(Section('configs', [
-            Write(f'/root/{n}', Resource(f'configs/{n}'))
-            for n in cfg.config_files
-        ]))
+    ops.append(Section('scripts', [
+        Run(f'mkdir {home}/scripts ;'),
+        *[
+            Write(f'{home}/scripts/{n}', r.read_text())
+            for n, r in sorted(lang.get_relative_resources('resources.scripts', globals=globals()).items())
+            if r.is_file
+        ],
+        Run(f'chmod a+x {home}/scripts/* ;'),
+        Run(f"""echo '\\n\\nexport PATH="$HOME/scripts:$PATH"' >> {home}/.bashrc ;"""),
+    ]))
 
     ops.append(Section('entrypoint', [
         *([Workdir(cfg.workdir)] if cfg.workdir is not None else []),

{omdev-0.0.0.dev547 → omdev-0.0.0.dev549}/omdev/dockerdev/helpers.py

@@ -24,6 +24,7 @@ def fragment_section(
         *,
         static_env: StaticEnv | None = None,
         cache_mounts: ta.Sequence[str] | None = None,
+        cache_mount_args: ta.Sequence[str] | None = None,
 ) -> Section:
     body: Content = Resource(f'fragments/{name}.sh')
 
@@ -34,6 +35,7 @@ def fragment_section(
         Run(
             body,
             cache_mounts=cache_mounts or None,
+            cache_mount_args=cache_mount_args or None,
         ),
     ])
 
@@ -59,7 +61,7 @@ def render_apt_install_dep_sets(*names: str) -> str:
     out.write(render_var_sections('DEPS', *dsl))
     out.write('\n')
 
-    out.write('apt-get install -y $DEPS\n')
+    out.write('apt-get install -y $DEPS ;\n')
 
     return out.getvalue()
 

{omdev-0.0.0.dev547 → omdev-0.0.0.dev549}/omdev/dockerdev/ops.py

@@ -29,6 +29,11 @@ class Env(Op):
     items: ta.Iterable[tuple[str, str]]
 
 
+@dc.dataclass(frozen=True)
+class User(Op):
+    user: str
+
+
 @dc.dataclass(frozen=True, kw_only=True)
 class Copy(Op):
     src: str
@@ -52,6 +57,7 @@ class Run(Op):
     _: dc.KW_ONLY
 
     cache_mounts: ta.Sequence[str] | None = None
+    cache_mount_args: ta.Sequence[str] | None = None
 
 
 @dc.dataclass(frozen=True)

{omdev-0.0.0.dev547 → omdev-0.0.0.dev549}/omdev/dockerdev/rendering.py

@@ -20,6 +20,7 @@ from .ops import From
 from .ops import Op
 from .ops import Run
 from .ops import Section
+from .ops import User
 from .ops import Workdir
 from .ops import Write
 
@@ -179,6 +180,11 @@ def render_env(op: Env) -> str:
     ])
 
 
+@render_op.register(User)
+def render_user(op: User) -> str:
+    return f'USER {op.user}'
+
+
 @render_op.register(Copy)
 def render_copy(op: Copy) -> str:
     return f'COPY {op.src} {op.dst}'
@@ -213,7 +219,16 @@ def render_run(op: Run) -> str:
     if op.cache_mounts:
         out.write('RUN \\\n')
         for cm in op.cache_mounts:
-            out.write(INDENT + f'--mount=target={cm},type=cache,sharing=locked \\\n')
+            out.write(INDENT + ''.join([
+                '--mount=',
+                ','.join([
+                    f'target={cm}',
+                    'type=cache',
+                    'sharing=locked',
+                    *(op.cache_mount_args or []),
+                ]),
+                ' \\\n',
+            ]))
         out.write('( \\\n')
     else:
         out.write('RUN (\\\n')

omdev-0.0.0.dev549/omdev/dockerdev/resources/depsets/x11.toml

@@ -0,0 +1,4 @@
+deps = [
+  'dbus-x11',
+  'x11-apps',
+]

{omdev-0.0.0.dev547 → omdev-0.0.0.dev549}/omdev/dockerdev/resources/fragments/apt.sh

@@ -1,6 +1,7 @@
 set -ex ;
 
 rm -f /etc/apt/apt.conf.d/docker-clean ;
+rm -f /etc/dpkg/dpkg.cfg.d/excludes ;
 
 export DEBIAN_FRONTEND=noninteractive ;
 apt-get update ;

omdev-0.0.0.dev549/omdev/dockerdev/resources/fragments/docker.sh

@@ -0,0 +1,10 @@
+set -ex ;
+
+mkdir -p /etc/apt/keyrings ;
+curl -fsSL 'https://download.docker.com/linux/ubuntu/gpg' | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg ;
+echo \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu
+  $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null ;
+
+sudo apt-get update ;
+sudo apt-get install -y docker-ce-cli ;

{omdev-0.0.0.dev547 → omdev-0.0.0.dev549}/omdev/dockerdev/resources/fragments/firefox.sh

@@ -1,6 +1,6 @@
 set -ex ;
 
-add-apt-repository ppa:mozillateam/ppa ;
+sudo add-apt-repository ppa:mozillateam/ppa ;
 
 echo "
 Package: *\n
@@ -12,8 +12,8 @@ Pin: version 1:1snap1-0ubuntu2\n
 Pin-Priority: -1\n
 " | sudo tee /etc/apt/preferences.d/mozilla-firefox ;
 
-apt-get update ;
-apt-get install -y firefox ;
+sudo apt-get update ;
+sudo apt-get install -y firefox ;
 
 echo 'Unattended-Upgrade::Allowed-Origins:: "LP-PPA-mozillateam:${distro_codename}";' |
   sudo tee /etc/apt/apt.conf.d/51unattended-upgrades-firefox ;

{omdev-0.0.0.dev547 → omdev-0.0.0.dev549}/omdev/dockerdev/resources/fragments/go.sh

@@ -1,5 +1,7 @@
 set -ex ;
 
+GO_VERSION=$(curl -fsSL https://go.dev/VERSION?m=text | head -n1 | sed 's/^go//') ;
+
 curl -fsSL "https://go.dev/dl/go${GO_VERSION}.linux-$(dpkg --print-architecture).tar.gz" | tar -C "$HOME" -xzf - ;
 mv "$HOME/go" "$HOME/.go" ;
 

{omdev-0.0.0.dev547 → omdev-0.0.0.dev549}/omdev/dockerdev/resources/fragments/jdk.sh

@@ -4,5 +4,5 @@ sudo apt install gnupg ca-certificates curl ;
 curl -s 'https://repos.azul.com/azul-repo.key' | sudo gpg --dearmor -o /usr/share/keyrings/azul.gpg ;
 echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | sudo tee /etc/apt/sources.list.d/zulu.list ;
 
-apt-get update ;
-apt-get install -y ${JDKS} ;
+sudo apt-get update ;
+sudo apt-get install -y ${JDKS} ;

omdev-0.0.0.dev549/omdev/dockerdev/resources/fragments/man.sh

@@ -0,0 +1,3 @@
+set -ex ;
+
+yes | sudo unminimize ;

omdev-0.0.0.dev549/omdev/dockerdev/resources/fragments/pyenv.sh

@@ -0,0 +1,7 @@
+set -ex ;
+
+git clone 'https://github.com/pyenv/pyenv' ~/.pyenv ;
+
+for V in ${PYENV_VERSIONS} ; do
+  PYTHON_BUILD_CACHE_PATH=~/.pyenv_cache ~/.pyenv/bin/pyenv install -s "$V" ;
+done ;

omdev-0.0.0.dev549/omdev/dockerdev/resources/fragments/sshd.sh

@@ -0,0 +1,7 @@
+set -ex ;
+
+sudo sed -i 's/^#*PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config ;
+sudo sed -i 's/^#X11UseLocalhost yes/X11UseLocalhost no/' /etc/ssh/sshd_config ;
+sudo sed -i 's/^# Ciphers and keying/Ciphers chacha20-poly1305@openssh.com/' /etc/ssh/sshd_config ;
+sudo sed -i 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' /etc/pam.d/sshd ;
+sudo mkdir /var/run/sshd ;

omdev-0.0.0.dev549/omdev/dockerdev/resources/fragments/user.sh

@@ -0,0 +1,6 @@
+set -ex ;
+
+groupadd --gid ${NEWGID} ${NEWUSER} ;
+useradd --uid ${NEWUID} --gid ${NEWGID} -m -s /bin/bash -d /${NEWUSER} ${NEWUSER} ;
+echo "${NEWUSER} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${NEWUSER} ;
+chmod 0440 /etc/sudoers.d/${NEWUSER} ;

omdev-0.0.0.dev549/omdev/dockerdev/resources/fragments/vcpkg.sh

@@ -0,0 +1,8 @@
+set -ex ;
+
+git clone 'https://github.com/microsoft/vcpkg' ~/.vcpkg_root ;
+(cd ~/.vcpkg_root && ./bootstrap-vcpkg.sh) ;
+
+echo '\n
+export VCPKG_ROOT="$HOME/.vcpkg_root"\n
+' >> ~/.bashrc ;

{omdev-0.0.0.dev547 → omdev-0.0.0.dev549}/omdev/dockerdev/resources/fragments/zig.sh

@@ -1,6 +1,12 @@
 set -ex ;
 
+ZIG_VERSION=$(
+  curl -fsSL 'https://ziglang.org/download/index.json' |
+  jq -r 'to_entries | map(select(.key != "master")) | map(.value) | sort_by(.version) | last | .version'
+) ;
+
 curl -fsSL "https://ziglang.org/download/${ZIG_VERSION}/zig-$(uname -m)-linux-${ZIG_VERSION}.tar.xz" | tar -xJ -C "$HOME" ;
+
 mv "$HOME/zig-$(uname -m)-linux-${ZIG_VERSION}" "$HOME/.zig" ;
 
 echo '\n

omdev-0.0.0.dev549/omdev/dockerdev/resources/scripts/install-claude-code

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -ex
+
+curl -fsSL https://claude.ai/install.sh | bash

omdev-0.0.0.dev549/omdev/dockerdev/resources/scripts/run-dbus

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -ex
+
+sudo mkdir -p /var/run/dbus /run/dbus
+sudo dbus-daemon --system --nofork --nopidfile

{omdev-0.0.0.dev547 → omdev-0.0.0.dev549}/omdev/java/cli.py

@@ -1,6 +1,7 @@
 """
 TODO:
  - JAVA_HOME
+ - pomgen colon-sep dep type/scope
 
 See:
  - https://github.com/jbangdev/jbang
@@ -19,6 +20,7 @@ from omlish.argparse import all as ap
 from .. import intellij as ij
 from .. import magic
 from . import pomgen as pg
+from .utils import insert_before_first_non_header_line
 
 
 ##
@@ -70,7 +72,7 @@ def build_maven_project(
         if require_symlink:
             raise ValueError(f'Cannot symlink source file, no package specified.')
         group_id = DEFAULT_PROJECT_GROUP_ID
-        src = f'package {group_id};\n\n{src}'
+        src = insert_before_first_non_header_line(src, f'package {group_id};\n')
         can_symlink = False
 
     check.non_empty_str(group_id)