# HG changeset patch
# User Richard Westhaver <ellis@rwest.io>
# Date 1720326130 14400
# Node ID 43c84d8fb729870bb1fa8411686ad03bade1778f
# Parent  a67e164d4defe3f121a3da96959f238d79fad578
rename base to scratch, update devbox

diff -r a67e164d4def -r 43c84d8fb729 Containerfile.base
diff -r a67e164d4def -r 43c84d8fb729 Containerfile.dev
--- a/Containerfile.dev	Thu Jul 04 23:47:28 2024 -0400
+++ b/Containerfile.dev	Sun Jul 07 00:22:10 2024 -0400
@@ -1,9 +1,9 @@
 FROM localhost/archlinux:latest
-RUN --network=host pacman -Sy uutils-coreutils sysstat iotop imagemagick giflib libgccjit libxaw snappy sbcl clang lld liburing libxkbcommon --noconfirm
+RUN --network=host pacman -Sy uutils-coreutils sysstat iotop imagemagick giflib libgccjit libxaw snappy sbcl llvm clang lld liburing libxkbcommon --noconfirm
 # custom
 ARG DEV=dev
 ARG DEV_HOME=/home/${DEV}
-ARG ID=808
+ARG DEV_ID=808
 # stage0
 RUN mkdir -p /usr/share/lisp /usr/local/share/lisp /usr/local/share/rust
 # COPY .stash/bin/ /usr/local/bin/
@@ -18,12 +18,15 @@
 ENV RUSTUP_HOME="/usr/local/share/rust/rustup"
 # stage1
 RUN ./bootstrap.sh
+RUN install -m 755 .stash/bin/* /usr/local/bin/
+RUN mv .stash/lib/** /usr/local/lib/
+RUN mv .stash/share/lisp/** /usr/local/share/lisp/
 ENV PATH="$PATH:/usr/local/share/rust/cargo/bin"
 RUN skel run install-rocksdb-pack
-RUN skel run install-emacs-mini-pack
 RUN skel make tree-sitter
+RUN skel make tree-sitter-install
 RUN skel make tree-sitter-langs
-RUN useradd --system -s /usr/bin/bash -u ${ID} -m ${DEV}
+RUN useradd --system -s /usr/bin/bash -u ${DEV_ID} -m ${DEV}
 RUN groupadd -g 128 engineer -U ${DEV}
 RUN groupadd -g 256 operator -U ${DEV}
 RUN chown -R ${DEV}:engineer /usr/local/share/
@@ -40,4 +43,5 @@
 WORKDIR ${DEV_HOME}
 RUN rm -rf /usr/local/src/*
 ENV DEV=${DEV}
-ENV DEV_ID=${ID}
\ No newline at end of file
+ENV DEV_ID=${DEV_ID}
+ENTRYPOINT ["/usr/bin/bash"]
\ No newline at end of file
diff -r a67e164d4def -r 43c84d8fb729 Containerfile.scratch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Containerfile.scratch	Sun Jul 07 00:22:10 2024 -0400
@@ -0,0 +1,1 @@
+FROM scratch
\ No newline at end of file