# HG changeset patch # User Richard Westhaver # Date 1721696479 14400 # Node ID fc675ca6075b8b044fcea46e56643ef4437be354 # Parent b97af2c623738b3d4318bce057e14b18e8769c36 container updates diff -r b97af2c62373 -r fc675ca6075b Containerfile.dev --- a/Containerfile.dev Sun Jul 21 18:00:59 2024 -0400 +++ b/Containerfile.dev Mon Jul 22 21:01:19 2024 -0400 @@ -38,6 +38,10 @@ RUN rustup component add --toolchain nightly rust-src rust-analyzer rustc-dev llvm-tools-preview WORKDIR ${DEV_HOME} RUN rm -rf ${DEV_HOME}/.stash/* +RUN hg clone https://vc.compiler.company/comp/home .stash/home && cd .stash/home && hg up ${DEV} +RUN cp .stash/home/.homerc ${DEV_HOME}/.homerc +RUN homer install ENV DEV=${DEV} ENV DEV_ID=${DEV_ID} +ENV DEV_HOME=${DEV_HOME} ENTRYPOINT ["/usr/bin/bash"] \ No newline at end of file diff -r b97af2c62373 -r fc675ca6075b Containerfile.operator --- a/Containerfile.operator Sun Jul 21 18:00:59 2024 -0400 +++ b/Containerfile.operator Mon Jul 22 21:01:19 2024 -0400 @@ -1,3 +1,10 @@ FROM localhost/dev:latest -RUN hg clone https://vc.compiler.company/comp/infra -RUN infra/scripts/wg-gen-keys.sh private.key public.key \ No newline at end of file +RUN hg clone https://vc.compiler.company/comp/infra .stash/infra +RUN .stash/infra/scripts/wg-gen-keys.sh private.key public.key +WORKDIR .stash/infra +USER root +RUN skel make tmp +RUN skel run install-emacs-mini-pack +RUN skel clean +WORKDIR ${DEV_HOME} +USER ${DEV} \ No newline at end of file diff -r b97af2c62373 -r fc675ca6075b Containerfile.vc --- a/Containerfile.vc Sun Jul 21 18:00:59 2024 -0400 +++ b/Containerfile.vc Mon Jul 22 21:01:19 2024 -0400 @@ -18,6 +18,7 @@ RUN skel make packy-repos RUN mv .stash/src ${VC_HOME}/src RUN skel clean +RUN skel run init-vc-bundles WORKDIR ${VC_HOME} ENV VC_USER=${VC_USER} ENV VC_ID=${VC_ID}