# HG changeset patch
# User Richard Westhaver <ellis@rwest.io>
# Date 1725410439 14400
# Node ID 28492e359d92979562b44ae990ad8bec5f4427c5
# Parent  512cf2eba23d216d41b52d7b11e9ff4c84a4c518
subup

diff -r 512cf2eba23d -r 28492e359d92 Containerfile.operator
--- a/Containerfile.operator	Mon Aug 19 10:31:22 2024 -0400
+++ b/Containerfile.operator	Tue Sep 03 20:40:39 2024 -0400
@@ -9,7 +9,9 @@
 RUN hg clone https://vc.compiler.company/comp/infra .stash/infra
 RUN .stash/infra/scripts/wg-gen-keys.sh private.key public.key
 WORKDIR .stash/infra
-# RUN sudo skel run install-emacs-pack
+RUN mkdir -pv .stash/tmp
+RUN sudo skel build emacs
+RUN sudo skel install emacs
 RUN sudo skel clean
 WORKDIR /home/operator
 RUN cd .stash/home && hg up operator && homer install
diff -r 512cf2eba23d -r 28492e359d92 Containerfile.vc
--- a/Containerfile.vc	Mon Aug 19 10:31:22 2024 -0400
+++ b/Containerfile.vc	Tue Sep 03 20:40:39 2024 -0400
@@ -3,23 +3,16 @@
 ARG VC_HOME=/home/${VC_USER}
 ARG VC_ID=842
 USER root
-RUN --network=host pacman -Sy python-pygments python-pygit2 python-dulwich --noconfirm
+RUN --network=host pacman -Sy python-pygments python-pygit2 python-dulwich apache nano --noconfirm
 RUN useradd --system -s /usr/bin/bash -u ${VC_ID} -m ${VC_USER}
 USER ${VC_USER}
 WORKDIR ${VC_HOME}
 RUN mkdir .stash
-RUN hg clone https://vc.compiler.company/comp/infra .stash/infra
+RUN hg clone https://vc.compiler.company/infra .stash/infra
 RUN .stash/infra/scripts/wg-gen-keys.sh private.key public.key
-RUN hg clone https://vc.compiler.company/comp/home .stash/home
+RUN hg clone https://vc.compiler.company/home .stash/home
 RUN cd .stash/home && hg up ${VC_USER} && cp .homerc ${VC_HOME}/.homerc
 RUN homer install
-WORKDIR .stash/infra
-RUN skel make repos
-RUN skel make packy-repos
-RUN mv .stash/src ${VC_HOME}/src
-RUN skel clean
-RUN skel run init-vc-bundles
-WORKDIR ${VC_HOME}
 ENV VC_USER=${VC_USER}
 ENV VC_ID=${VC_ID}
-ENTRYPOINT ["hg", "serve", "--web-conf", "hgweb.conf"]
\ No newline at end of file
+# ENTRYPOINT ["hg", "serve", "--web-conf", "hgweb.conf"]
\ No newline at end of file
diff -r 512cf2eba23d -r 28492e359d92 skelfile
--- a/skelfile	Mon Aug 19 10:31:22 2024 -0400
+++ b/skelfile	Tue Sep 03 20:40:39 2024 -0400
@@ -6,18 +6,29 @@
 :components
 ((:containerfile "scratch")
  (:containerfile "alpine")
+ (:containerfile "alpine-worker")
  (:containerfile "alpine-infra")
  (:containerfile "archlinux")
- (:containerfile "ubuntu")
  (:containerfile "dev")
- (:containerfile "operator")
  (:containerfile "worker")
- (:containerfile "web"))
+ (:containerfile "infra")
+ (:containerfile "operator")
+ (:containerfile "web")
+ (:containerfile "vc")
+ (:containerfile "ubuntu")
+ (:containerfile "mail")
+ (:containerfile "amazon")
+ (:containerfile "archriscv"))
 :rules
-((web () #$podman run --name web --replace -dt -p 8080:8080 -p 2020:2020 \
-      --volume /srv/http:/home/web/www \
-      web$#)
- (run-infra (infra-sbcl infra-stumpwm infra-emacs infra-rocksdb))
+((web ()
+      (:build () #$podman build -f Containerfile.web -t web --no-cache$#)
+      (:run ()
+            #$podman run --name web --replace -dt -p 8080:8080 -p 2020:2020 \
+            --volume /srv/http:/home/web/www \
+            web$#))
+ (infra ()
+        (:build () #$podman build -f Containerfile.infra -t infra --no-cache$#)
+        (:run (infra-sbcl infra-stumpwm infra-emacs infra-rocksdb)))
  (infra-sbcl () #$podman run --replace -dt -v /opt/stash:/usr/local/share/stash:z --name infra-sbcl infra \
              -c "skel build sbcl && skel dist sbcl && sudo cp .stash/sbcl.tar.zst /usr/local/share/stash"$#)
  (infra-stumpwm () #$podman run --replace -dt -v /opt/stash:/usr/local/share/stash:z --name infra-sbcl infra \
@@ -26,9 +37,28 @@
              -c "skel build emacs && skel dist emacs && sudo cp .stash/emacs.tar.zst /usr/local/share/stash"$#)
  (infra-rocksdb () #$podman run --replace -dt -v /opt/stash:/usr/local/share/stash:z --name infra-rocksdb infra \
              -c "skel build rocksdb && skel dist rocksdb && sudo cp .stash/rocksdb.tar.zst /usr/local/share/stash"$#)
- (operator () #$podman run --name operator --replace -dt operator$#)
- (vc () #$podman run --name vc --replace -dt -p 8888:8888 vc$#)
- (dev () #$podman run --name dev --replace -dt dev$#)
- (mail () #$podman run --name mail --replace -dt mail$#)
- (alpine-infra () #$podman run --name alpine-infra --replace -dt alpine-infra$#)
- (worker () #$podman run --name worker --replace -dt worker$#))
+ (operator ()
+           (:build () #$podman build -f Containerfile.operator -t operator --no-cache$#)
+           (:run () #$podman run --replace -dt --name operator \
+                 -v /opt/stash:/usr/local/share/stash:z \
+                 -v /opt/store:/usr/local/share/store:z \
+                 operator$#))
+ (vc ()
+     (:build () #$podman build -f Containerfile.vc -t vc --no-cache$#)
+     (:run () #$podman run --name vc --replace -dt -v $HOME/src:/home/vc/src:z -p 8888:8888 vc$#))
+ (dev ()
+      (:build () #$podman build -f Containerfile.dev -t dev --no-cache$#)
+      (:run () #$podman run --name dev --replace -dt dev$#))
+ (archlinux ()
+            (:build () #$podman build -f Containerfile.archlinux -t archlinux --no-cache$#)
+            (:run () #$podman run --name archlinux --replace -dt archlinux$#)
+             )
+ (mail ()
+       (:build () #$podman build -f Containerfile.mail -t mail --no-cache$#)
+       (:run () #$podman run --name mail --replace -dt mail$#))
+ (alpine-infra ()
+               (:build () #$podman build -f Containerfile.alpine-infra -t alpine-infra --replace$#)
+               (:run () #$podman run --name alpine-infra --replace -dt alpine-infra$#))
+ (worker ()
+         (:build () #$podman build -f Containerfile.worker -t worker --no-cache$#)
+         (:run () #$podman run --name worker --replace -dt worker$#)))