# HG changeset patch
# User Richard Westhaver <ellis@rwest.io>
# Date 1721540811 14400
# Node ID ce053bf5ea3cc671bf854476040d4fcea3d2fd04
# Parent  bd872fae61db4316c9e3a45239e655f0d284ba73
vc updates

diff -r bd872fae61db -r ce053bf5ea3c Containerfile.dev
--- a/Containerfile.dev	Mon Jul 08 20:49:05 2024 -0400
+++ b/Containerfile.dev	Sun Jul 21 01:46:51 2024 -0400
@@ -17,7 +17,7 @@
 RUN ssh-keygen -A
 USER ${DEV}
 RUN mkdir ${DEV_HOME}/.stash
-WORKDIR /usr/local/src
+WORKDIR ${DEV_HOME}/.stash
 RUN hg clone https://vc.compiler.company/comp/infra
 WORKDIR infra
 ENV CARGO_HOME="/usr/local/share/rust/cargo"
@@ -37,7 +37,7 @@
 RUN rustup default nightly
 RUN rustup component add --toolchain nightly rust-src rust-analyzer rustc-dev llvm-tools-preview
 WORKDIR ${DEV_HOME}
-RUN rm -rf /usr/local/src/*
+RUN rm -rf ${DEV_HOME}/.stash/*
 ENV DEV=${DEV}
 ENV DEV_ID=${DEV_ID}
 ENTRYPOINT ["/usr/bin/bash"]
\ No newline at end of file
diff -r bd872fae61db -r ce053bf5ea3c Containerfile.vc
--- a/Containerfile.vc	Mon Jul 08 20:49:05 2024 -0400
+++ b/Containerfile.vc	Sun Jul 21 01:46:51 2024 -0400
@@ -1,10 +1,22 @@
-FROM localhost/box:latest
+FROM localhost/dev:latest
+USER root
 ARG VC_USER=vc
 ARG VC_HOME=/home/${VC_USER}
 ARG VC_ID=842
-RUN useradd --system -s /usr/bin/bash -u ${ID} -m ${DEV}
-RUN infra/scripts/wg-gen-keys.sh private.key public.key
-RUN mkdir ${VC_HOME}/.stash
+RUN useradd --system -s /usr/bin/bash -u ${VC_ID} -m ${VC_USER}
+USER ${VC_USER}
+WORKDIR ${VC_HOME}
+RUN mkdir .stash
+RUN hg clone https://vc.compiler.company/comp/infra .stash/infra
+RUN .stash/infra/scripts/wg-gen-keys.sh private.key public.key
+RUN hg clone https://vc.compiler.company/comp/home .stash/home
+RUN cd .stash/home && hg up ${VC_USER}
+RUN cp -rf .stash/home/* ~/
+WORKDIR .stash/infra
+RUN skel make repos
+RUN skel make packy-repos
+RUN mv .stash/src ${VC_HOME}/src
+RUN skel clean
 WORKDIR ${VC_HOME}
 ENV VC_USER=${VC_USER}
 ENV VC_ID=${VC_ID}
\ No newline at end of file