# HG changeset patch
# User Richard Westhaver <ellis@rwest.io>
# Date 1727204547 14400
# Node ID 90970dfd5a8bf8734e4039616010bca1ed74b314
# Parent  c0ed453c44f90740506907af67580a910cbd14c2
merge

diff -r c0ed453c44f9 -r 90970dfd5a8b Containerfile.dev
--- a/Containerfile.dev	Fri Sep 13 20:18:24 2024 -0400
+++ b/Containerfile.dev	Tue Sep 24 15:02:27 2024 -0400
@@ -24,9 +24,11 @@
 ENV CARGO_HOME="/usr/local/share/rust/cargo"
 ENV RUSTUP_HOME="/usr/local/share/rust/rustup"
 RUN ./bootstrap.sh
-RUN mv .stash/bin/skel /usr/local/bin/skel
+RUN mv .stash/bin/core /usr/local/bin/core
+RUN ln -sf /usr/local/bin/core /usr/local/bin/skel
+RUN ln -sf /usr/local/bin/core /usr/local/bin/homer
 ENV PATH="$PATH:/usr/local/share/rust/cargo/bin"
-RUN skel run install-rocksdb-pack
+RUN ./scripts/install-rocksdb-pack.sh
 RUN skel build tree-sitter
 RUN skel install tree-sitter tree-sitter-langs
 RUN mv .stash/lib/** /usr/local/lib/
diff -r c0ed453c44f9 -r 90970dfd5a8b Containerfile.emacs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Containerfile.emacs	Tue Sep 24 15:02:27 2024 -0400
@@ -0,0 +1,5 @@
+FROM localhost/operator:latest
+# bootstrap
+RUN emacs --load ~/.emacs.d/init.el --kill
+ENTRYPOINT [ "emacs" ]
+
diff -r c0ed453c44f9 -r 90970dfd5a8b Containerfile.operator
--- a/Containerfile.operator	Fri Sep 13 20:18:24 2024 -0400
+++ b/Containerfile.operator	Tue Sep 24 15:02:27 2024 -0400
@@ -4,15 +4,21 @@
 RUN echo "operator ALL=(ALL:ALL) NOPASSWD: ALL" | sudo tee /etc/sudoers.d/operator
 RUN --network=host pacman -Sy aspell hunspell-en_us --noconfirm
 RUN pacman -Scc --noconfirm
-USER operator
 WORKDIR /home/operator
-RUN hg clone https://vc.compiler.company/comp/infra .stash/infra
+RUN hg clone https://vc.compiler.company/infra .stash/infra
+RUN hg clone https://vc.compiler.company/core .stash/core
 RUN .stash/infra/scripts/wg-gen-keys.sh private.key public.key
 WORKDIR .stash/infra
 RUN mkdir -pv .stash/tmp
 RUN sudo skel build emacs
 RUN sudo skel install emacs
 RUN sudo skel clean
+WORKDIR /home/operator/.stash
+USER operator
+RUN cd core/emacs && make
+USER root
+RUN rm -rf .stash/core .stash/infra
+USER operator
 WORKDIR /home/operator
 RUN cd .stash/home && hg up operator && homer install
 ENV DEV=operator
diff -r c0ed453c44f9 -r 90970dfd5a8b Containerfile.org
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Containerfile.org	Tue Sep 24 15:02:27 2024 -0400
@@ -0,0 +1,3 @@
+FROM localhost/emacs:latest
+RUN hg clone https://vc.compiler.company/org org
+WORKDIR org
diff -r c0ed453c44f9 -r 90970dfd5a8b skelfile
--- a/skelfile	Fri Sep 13 20:18:24 2024 -0400
+++ b/skelfile	Tue Sep 24 15:02:27 2024 -0400
@@ -52,6 +52,11 @@
  (dev ()
       (:build () #$podman build -f Containerfile.dev -t dev --no-cache$#)
       (:run () #$podman run --name dev --replace -dt dev$#))
+ (emacs ()
+        (:build () #$podman build -f Containerfile.emacs -t emacs --no-cache$#)
+        (:run () #$podman run --name emacs --replace -it emacs$#))
+ (org ()
+      (:build () #$podman build -f Containerfile.org -t org --no-cache$#))
  (archlinux ()
             (:build () #$podman build -f Containerfile.archlinux -t archlinux --no-cache$#)
             (:run () #$podman run --name archlinux --replace -dt archlinux$#)