# HG changeset patch
# User Richard Westhaver <ellis@rwest.io>
# Date 1718581969 0
# Node ID f2244a1fa02f204ce1eca7be05fee7a36687eb8e
# Parent  65b548b0ce40e42970793abdbe8ab5c03bf33006
fixes

diff -r 65b548b0ce40 -r f2244a1fa02f Containerfile.archlinux
--- a/Containerfile.archlinux	Sun Jun 16 05:01:49 2024 +0000
+++ b/Containerfile.archlinux	Sun Jun 16 23:52:49 2024 +0000
@@ -1,4 +1,4 @@
 FROM archlinux:latest
 RUN --network=host pacman-key --init
 RUN --network=host pacman-key --populate archlinux
-RUN --network=host pacman -Syu base-devel less uutils-coreutils openssh mercurial git sqlite btrfs-progs liburing wireguard-tools clang tree-sitter libxcb glibc openssl zstd --noconfirm
\ No newline at end of file
+RUN --network=host pacman -Syu base-devel less uutils-coreutils openssl openssh mercurial git liburing wireguard-tools clang libxcb zstd --noconfirm
\ No newline at end of file
diff -r 65b548b0ce40 -r f2244a1fa02f Containerfile.box
--- a/Containerfile.box	Sun Jun 16 05:01:49 2024 +0000
+++ b/Containerfile.box	Sun Jun 16 23:52:49 2024 +0000
@@ -5,7 +5,7 @@
 ARG DEV_HOME=/home/${DEV}
 ARG ID=808
 # stage0
-RUN mkdir -p /usr/share/lisp /usr/local/share/lisp
+RUN mkdir -p /usr/share/lisp /usr/local/share/lisp /usr/local/share/rust
 COPY .stash/bin/ /usr/local/bin/
 COPY .stash/lib/ /usr/local/lib/
 COPY .stash/include/ /usr/local/include/
@@ -14,17 +14,15 @@
 WORKDIR /usr/local/src
 RUN hg clone https://vc.compiler.company/comp/infra
 WORKDIR infra
-ENV CARGO_HOME="/usr/local/share/cargo"
-ENV RUSTUP_HOME="/usr/local/share/rustup"
+ENV CARGO_HOME="/usr/local/share/rust/cargo"
+ENV RUSTUP_HOME="/usr/local/share/rust/rustup"
 # stage1
-ENV PATH="$PATH:/usr/local/share/cargo/bin"
+ENV PATH="$PATH:/usr/local/share/rust/cargo/bin"
 RUN skel make rustup
-RUN rustup update
-# dev rustc components
 RUN rustup default nightly
 RUN rustup component add --toolchain nightly rust-src rust-analyzer rustc-dev llvm-tools-preview
-# RUN skel make tree-sitter
-# RUN skel make tree-sitter-langs
+RUN skel make tree-sitter
+RUN skel make tree-sitter-langs
 RUN useradd --system -s /usr/bin/bash -u ${ID} -k /etc/skel -m ${DEV}
 RUN groupadd -g 128 engineer -U ${DEV}
 RUN groupadd -g 256 operator -U ${DEV}
@@ -33,11 +31,10 @@
 RUN chown -R ${DEV}:engineer /usr/local/bin/
 RUN chown -R ${DEV}:engineer /usr/local/etc/
 RUN chown -R ${DEV}:engineer /usr/local/man/
-WORKDIR /usr/local/src
 USER ${DEV}
-# RUN cp -rf core/lisp /usr/local/share/lisp/core
-RUN rm -rf ./infra/.stas*
+RUN mkdir ${DEV_HOME}/.stash
+RUN skel make clean
+RUN skel make quicklisp
 WORKDIR ${DEV_HOME}
-RUN mkdir .stash
 ENV DEV=${DEV}
 ENV DEV_ID=${ID}
\ No newline at end of file