1.1--- a/Containerfile.operator	Mon Aug 19 10:31:22 2024 -0400
     1.2+++ b/Containerfile.operator	Tue Sep 03 20:40:39 2024 -0400
     1.3@@ -9,7 +9,9 @@
     1.4 RUN hg clone https://vc.compiler.company/comp/infra .stash/infra
     1.5 RUN .stash/infra/scripts/wg-gen-keys.sh private.key public.key
     1.6 WORKDIR .stash/infra
     1.7-# RUN sudo skel run install-emacs-pack
     1.8+RUN mkdir -pv .stash/tmp
     1.9+RUN sudo skel build emacs
    1.10+RUN sudo skel install emacs
    1.11 RUN sudo skel clean
    1.12 WORKDIR /home/operator
    1.13 RUN cd .stash/home && hg up operator && homer install

     2.1--- a/Containerfile.vc	Mon Aug 19 10:31:22 2024 -0400
     2.2+++ b/Containerfile.vc	Tue Sep 03 20:40:39 2024 -0400
     2.3@@ -3,23 +3,16 @@
     2.4 ARG VC_HOME=/home/${VC_USER}
     2.5 ARG VC_ID=842
     2.6 USER root
     2.7-RUN --network=host pacman -Sy python-pygments python-pygit2 python-dulwich --noconfirm
     2.8+RUN --network=host pacman -Sy python-pygments python-pygit2 python-dulwich apache nano --noconfirm
     2.9 RUN useradd --system -s /usr/bin/bash -u ${VC_ID} -m ${VC_USER}
    2.10 USER ${VC_USER}
    2.11 WORKDIR ${VC_HOME}
    2.12 RUN mkdir .stash
    2.13-RUN hg clone https://vc.compiler.company/comp/infra .stash/infra
    2.14+RUN hg clone https://vc.compiler.company/infra .stash/infra
    2.15 RUN .stash/infra/scripts/wg-gen-keys.sh private.key public.key
    2.16-RUN hg clone https://vc.compiler.company/comp/home .stash/home
    2.17+RUN hg clone https://vc.compiler.company/home .stash/home
    2.18 RUN cd .stash/home && hg up ${VC_USER} && cp .homerc ${VC_HOME}/.homerc
    2.19 RUN homer install
    2.20-WORKDIR .stash/infra
    2.21-RUN skel make repos
    2.22-RUN skel make packy-repos
    2.23-RUN mv .stash/src ${VC_HOME}/src
    2.24-RUN skel clean
    2.25-RUN skel run init-vc-bundles
    2.26-WORKDIR ${VC_HOME}
    2.27 ENV VC_USER=${VC_USER}
    2.28 ENV VC_ID=${VC_ID}
    2.29-ENTRYPOINT ["hg", "serve", "--web-conf", "hgweb.conf"]
    2.30\ No newline at end of file
    2.31+# ENTRYPOINT ["hg", "serve", "--web-conf", "hgweb.conf"]
    2.32\ No newline at end of file

     3.1--- a/skelfile	Mon Aug 19 10:31:22 2024 -0400
     3.2+++ b/skelfile	Tue Sep 03 20:40:39 2024 -0400
     3.3@@ -6,18 +6,29 @@
     3.4 :components
     3.5 ((:containerfile "scratch")
     3.6  (:containerfile "alpine")
     3.7+ (:containerfile "alpine-worker")
     3.8  (:containerfile "alpine-infra")
     3.9  (:containerfile "archlinux")
    3.10- (:containerfile "ubuntu")
    3.11  (:containerfile "dev")
    3.12- (:containerfile "operator")
    3.13  (:containerfile "worker")
    3.14- (:containerfile "web"))
    3.15+ (:containerfile "infra")
    3.16+ (:containerfile "operator")
    3.17+ (:containerfile "web")
    3.18+ (:containerfile "vc")
    3.19+ (:containerfile "ubuntu")
    3.20+ (:containerfile "mail")
    3.21+ (:containerfile "amazon")
    3.22+ (:containerfile "archriscv"))
    3.23 :rules
    3.24-((web () #$podman run --name web --replace -dt -p 8080:8080 -p 2020:2020 \
    3.25-      --volume /srv/http:/home/web/www \
    3.26-      web$#)
    3.27- (run-infra (infra-sbcl infra-stumpwm infra-emacs infra-rocksdb))
    3.28+((web ()
    3.29+      (:build () #$podman build -f Containerfile.web -t web --no-cache$#)
    3.30+      (:run ()
    3.31+            #$podman run --name web --replace -dt -p 8080:8080 -p 2020:2020 \
    3.32+            --volume /srv/http:/home/web/www \
    3.33+            web$#))
    3.34+ (infra ()
    3.35+        (:build () #$podman build -f Containerfile.infra -t infra --no-cache$#)
    3.36+        (:run (infra-sbcl infra-stumpwm infra-emacs infra-rocksdb)))
    3.37  (infra-sbcl () #$podman run --replace -dt -v /opt/stash:/usr/local/share/stash:z --name infra-sbcl infra \
    3.38              -c "skel build sbcl && skel dist sbcl && sudo cp .stash/sbcl.tar.zst /usr/local/share/stash"$#)
    3.39  (infra-stumpwm () #$podman run --replace -dt -v /opt/stash:/usr/local/share/stash:z --name infra-sbcl infra \
    3.40@@ -26,9 +37,28 @@
    3.41              -c "skel build emacs && skel dist emacs && sudo cp .stash/emacs.tar.zst /usr/local/share/stash"$#)
    3.42  (infra-rocksdb () #$podman run --replace -dt -v /opt/stash:/usr/local/share/stash:z --name infra-rocksdb infra \
    3.43              -c "skel build rocksdb && skel dist rocksdb && sudo cp .stash/rocksdb.tar.zst /usr/local/share/stash"$#)
    3.44- (operator () #$podman run --name operator --replace -dt operator$#)
    3.45- (vc () #$podman run --name vc --replace -dt -p 8888:8888 vc$#)
    3.46- (dev () #$podman run --name dev --replace -dt dev$#)
    3.47- (mail () #$podman run --name mail --replace -dt mail$#)
    3.48- (alpine-infra () #$podman run --name alpine-infra --replace -dt alpine-infra$#)
    3.49- (worker () #$podman run --name worker --replace -dt worker$#))
    3.50+ (operator ()
    3.51+           (:build () #$podman build -f Containerfile.operator -t operator --no-cache$#)
    3.52+           (:run () #$podman run --replace -dt --name operator \
    3.53+                 -v /opt/stash:/usr/local/share/stash:z \
    3.54+                 -v /opt/store:/usr/local/share/store:z \
    3.55+                 operator$#))
    3.56+ (vc ()
    3.57+     (:build () #$podman build -f Containerfile.vc -t vc --no-cache$#)
    3.58+     (:run () #$podman run --name vc --replace -dt -v $HOME/src:/home/vc/src:z -p 8888:8888 vc$#))
    3.59+ (dev ()
    3.60+      (:build () #$podman build -f Containerfile.dev -t dev --no-cache$#)
    3.61+      (:run () #$podman run --name dev --replace -dt dev$#))
    3.62+ (archlinux ()
    3.63+            (:build () #$podman build -f Containerfile.archlinux -t archlinux --no-cache$#)
    3.64+            (:run () #$podman run --name archlinux --replace -dt archlinux$#)
    3.65+             )
    3.66+ (mail ()
    3.67+       (:build () #$podman build -f Containerfile.mail -t mail --no-cache$#)
    3.68+       (:run () #$podman run --name mail --replace -dt mail$#))
    3.69+ (alpine-infra ()
    3.70+               (:build () #$podman build -f Containerfile.alpine-infra -t alpine-infra --replace$#)
    3.71+               (:run () #$podman run --name alpine-infra --replace -dt alpine-infra$#))
    3.72+ (worker ()
    3.73+         (:build () #$podman build -f Containerfile.worker -t worker --no-cache$#)
    3.74+         (:run () #$podman run --name worker --replace -dt worker$#)))