# HG changeset patch
# User Richard Westhaver <ellis@rwest.io>
# Date 1723774220 14400
# Node ID 99106a32c531ff850e023fa63a6cb89e881fc47d
# Parent  9c7c441ca15b62e6e47107cd386c51fe7c30c238
alpine-worker updates

diff -r 9c7c441ca15b -r 99106a32c531 Containerfile.alpine-worker
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Containerfile.alpine-worker	Thu Aug 15 22:10:20 2024 -0400
@@ -0,0 +1,32 @@
+FROM localhost/alpine:latest
+ARG WORKER_ID=908
+ARG WORKER=worker
+ARG WORKER_HOME=/home/${WORKER}
+RUN apk add build-base zstd-dev curl make git linux-headers openssl-dev pkgconf m4 mercurial llvm libgccjit-dev zlib-dev texinfo gnutls-dev ncurses-dev
+RUN mkdir -pv /usr/share/lisp /usr/local/share/lisp
+RUN addgroup -g 128 engineer
+RUN addgroup -g 256 operator
+RUN addgroup -g 512 worker
+RUN adduser -D -u ${WORKER_ID} -G worker ${WORKER}
+RUN chown -R ${WORKER_ID}:worker /usr/local/
+RUN mkdir -pv ${WORKER_HOME}/.stash
+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 PATH="$PATH:/usr/local/share/cargo/bin:/usr/local/share/lisp/bin"
+RUN mkdir -pv .stash/tmp
+# RUN ./scripts/install-emacs-mini-pack.sh x86_64-unknown-linux-musl # fails byte-code validation
+RUN ./scripts/install-sbcl-pack.sh x86_64-unknown-linux-musl
+RUN ./scripts/install-rocksdb-pack.sh x86_64-unknown-linux-musl
+RUN cd .stash && curl -O https://beta.quicklisp.org/quicklisp.lisp
+RUN ./scripts/quicklisp-install.sh
+# RUN ./bootstrap.sh
+# WORKDIR ${WORKER_HOME}
+# RUN rm -rf /usr/local/src/*
+ENV WORKER=${WORKER}
+ENV WORKER_ID=${WORKER_ID}
+ENV WORKER_HOME=${WORKER_HOME}
+WORKDIR ${WORKER_HOME}
+ENTRYPOINT ["sh"]
\ No newline at end of file
diff -r 9c7c441ca15b -r 99106a32c531 Containerfile.worker
--- a/Containerfile.worker	Mon Aug 12 19:55:52 2024 -0400
+++ b/Containerfile.worker	Thu Aug 15 22:10:20 2024 -0400
@@ -1,32 +1,26 @@
-FROM localhost/alpine:latest
+FROM localhost/dev:latest
 ARG WORKER_ID=908
 ARG WORKER=worker
 ARG WORKER_HOME=/home/${WORKER}
-RUN apk add build-base zstd-dev curl make git linux-headers openssl-dev pkgconf m4 mercurial llvm libgccjit-dev zlib-dev texinfo gnutls-dev ncurses-dev
-RUN mkdir -pv /usr/share/lisp /usr/local/share/lisp
-RUN addgroup -g 128 engineer
-RUN addgroup -g 256 operator
-RUN addgroup -g 512 worker
-RUN adduser -D -u ${WORKER_ID} -G worker ${WORKER}
+USER root
+RUN useradd --system -s /usr/bin/bash -u ${WORKER_ID} -m ${WORKER} -G wheel
+RUN ssh-keygen -A
 RUN chown -R ${WORKER_ID}:worker /usr/local/
+USER ${WORKER}
 RUN mkdir -pv ${WORKER_HOME}/.stash
-WORKDIR /usr/local/src
+WORKDIR ${WORKER_HOME}/.stash
 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"
 ENV PATH="$PATH:/usr/local/share/cargo/bin:/usr/local/share/lisp/bin"
 RUN mkdir -pv .stash/tmp
-# RUN ./scripts/install-emacs-mini-pack.sh x86_64-unknown-linux-musl # fails byte-code validation
-RUN ./scripts/install-sbcl-pack.sh x86_64-unknown-linux-musl
-RUN ./scripts/install-rocksdb-pack.sh x86_64-unknown-linux-musl
-RUN cd .stash && curl -O https://beta.quicklisp.org/quicklisp.lisp
-RUN ./scripts/quicklisp-install.sh
-# RUN ./bootstrap.sh
-# WORKDIR ${WORKER_HOME}
-# RUN rm -rf /usr/local/src/*
+RUN skel install quicklisp
+RUN skel clean
+WORKDIR ${WORKER_HOME}
+RUN hg clone https://vc.compiler.company/comp/home .stash/home && cd .stash/home && hg up ${WORKER}
+RUN cp .stash/home/.homerc ${WORKER_HOME}/.homerc
+RUN homer install
 ENV WORKER=${WORKER}
 ENV WORKER_ID=${WORKER_ID}
-ENV WORKER_HOME=${WORKER_HOME}
-WORKDIR ${WORKER_HOME}
-ENTRYPOINT ["sh"]
\ No newline at end of file
+ENV WORKER_HOME=${WORKER_HOME}
\ No newline at end of file