# HG changeset patch
# User Richard Westhaver <ellis@rwest.io>
# Date 1718512436 14400
# Node ID ebe8eace7f0a68b3d86b01ab0475945cbe14dc60
# Parent  0d37b97f681e3118aa04f958cfb6e236dce9a0b1
updates

diff -r 0d37b97f681e -r ebe8eace7f0a Containerfile.box
--- a/Containerfile.box	Sun Jun 16 00:18:07 2024 -0400
+++ b/Containerfile.box	Sun Jun 16 00:33:56 2024 -0400
@@ -6,6 +6,11 @@
 ARG ID=808
 # stage0
 RUN mkdir -p /usr/share/lisp /usr/local/share/lisp
+COPY .stash/bin/ /usr/local/bin/
+COPY .stash/lib/ /usr/local/lib/
+COPY .stash/include/ /usr/local/include/
+COPY .stash/share/ /usr/local/share/
+COPY .stash/src/ /usr/local/src/
 WORKDIR /usr/local/src
 RUN hg clone https://vc.compiler.company/comp/infra
 RUN hg clone https://vc.compiler.company/comp/core
@@ -13,7 +18,6 @@
 ENV CARGO_HOME="/usr/local/share/cargo"
 ENV RUSTUP_HOME="/usr/local/share/rustup"
 # stage1
-RUN ./bootstrap.sh
 ENV PATH="$PATH:/usr/local/share/cargo/bin"
 RUN skel make rustup
 RUN rustup update
@@ -22,9 +26,9 @@
 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
-#ADD etc/sbclrc /etc/sbclrc
-#COPY etc/skel/ /etc/skel/
-#ADD etc/shells /etc/
+ADD etc/sbclrc /etc/sbclrc
+COPY etc/skel/ /etc/skel/
+ADD etc/shells /etc/
 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}
@@ -39,7 +43,5 @@
 RUN rm -rf ./*
 WORKDIR ${DEV_HOME}
 RUN mkdir .stash
-RUN hg clone https://vc.compiler.company/comp/infra
-RUN hg clone https://vc.compiler.company/comp/core
 ENV DEV=${DEV}
 ENV DEV_ID=${ID}
\ No newline at end of file
diff -r 0d37b97f681e -r ebe8eace7f0a Containerfile.worker
--- a/Containerfile.worker	Sun Jun 16 00:18:07 2024 -0400
+++ b/Containerfile.worker	Sun Jun 16 00:33:56 2024 -0400
@@ -6,21 +6,20 @@
 ARG WORKER=worker
 ARG WORKER_HOME=/home/${WORKER}
 # TODO: build sbcl for musl
-RUN apk add build-base zstd-dev curl make git linux-headers openssl-dev pkgconf clang m4 tree-sitter sbcl
-RUN mkdir /usr/share/lisp
-RUN mkdir /usr/local/share/lisp
+RUN apk add build-base zstd-dev curl make git linux-headers openssl-dev pkgconf clang m4
+RUN mkdir -p /usr/share/lisp /usr/local/share/lisp
+COPY .stash/bin/ /usr/local/bin/
+COPY .stash/lib/ /usr/local/lib/
+COPY .stash/include/ /usr/local/include/
+COPY .stash/share/ /usr/local/share/
+COPY .stash/src/ /usr/local/src/
 WORKDIR /usr/local/src
 RUN hg clone https://vc.compiler.company/comp/infra
-RUN hg clone https://vc.compiler.company/comp/core
 WORKDIR infra
-RUN scripts/get-sk.sh
+# RUN scripts/get-sk.sh
 ENV CARGO_HOME="/usr/local/share/cargo"
 ENV RUSTUP_HOME="/usr/local/share/rustup"
 ENV PATH="$PATH:/usr/local/share/cargo/bin:/usr/local/share/lisp/bin"
-# RUN sk make sbcl sbcl-install quicklisp rustup tree-sitter-langs rocksdb
-RUN make sbcl-install-gencgc
-RUN make quicklisp-install
-RUN make rocksdb-install
 RUN adduser -D -u ${ID} -k /etc/skel ${WORKER}
 USER ${WORKER}
 WORKDIR ${WORKER_HOME}