changeset 25: |
fc675ca6075b |
parent 24: |
b97af2c62373 |
child 26: |
29aa38f88ee6 |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Mon, 22 Jul 2024 21:01:19 -0400 |
files: |
Containerfile.dev Containerfile.operator Containerfile.vc |
description: |
container updates |
1.1--- a/Containerfile.dev Sun Jul 21 18:00:59 2024 -0400
1.2+++ b/Containerfile.dev Mon Jul 22 21:01:19 2024 -0400
1.3@@ -38,6 +38,10 @@
1.4 RUN rustup component add --toolchain nightly rust-src rust-analyzer rustc-dev llvm-tools-preview
1.5 WORKDIR ${DEV_HOME}
1.6 RUN rm -rf ${DEV_HOME}/.stash/*
1.7+RUN hg clone https://vc.compiler.company/comp/home .stash/home && cd .stash/home && hg up ${DEV}
1.8+RUN cp .stash/home/.homerc ${DEV_HOME}/.homerc
1.9+RUN homer install
1.10 ENV DEV=${DEV}
1.11 ENV DEV_ID=${DEV_ID}
1.12+ENV DEV_HOME=${DEV_HOME}
1.13 ENTRYPOINT ["/usr/bin/bash"]
1.14\ No newline at end of file
2.1--- a/Containerfile.operator Sun Jul 21 18:00:59 2024 -0400
2.2+++ b/Containerfile.operator Mon Jul 22 21:01:19 2024 -0400
2.3@@ -1,3 +1,10 @@
2.4 FROM localhost/dev:latest
2.5-RUN hg clone https://vc.compiler.company/comp/infra
2.6-RUN infra/scripts/wg-gen-keys.sh private.key public.key
2.7\ No newline at end of file
2.8+RUN hg clone https://vc.compiler.company/comp/infra .stash/infra
2.9+RUN .stash/infra/scripts/wg-gen-keys.sh private.key public.key
2.10+WORKDIR .stash/infra
2.11+USER root
2.12+RUN skel make tmp
2.13+RUN skel run install-emacs-mini-pack
2.14+RUN skel clean
2.15+WORKDIR ${DEV_HOME}
2.16+USER ${DEV}
2.17\ No newline at end of file
3.1--- a/Containerfile.vc Sun Jul 21 18:00:59 2024 -0400
3.2+++ b/Containerfile.vc Mon Jul 22 21:01:19 2024 -0400
3.3@@ -18,6 +18,7 @@
3.4 RUN skel make packy-repos
3.5 RUN mv .stash/src ${VC_HOME}/src
3.6 RUN skel clean
3.7+RUN skel run init-vc-bundles
3.8 WORKDIR ${VC_HOME}
3.9 ENV VC_USER=${VC_USER}
3.10 ENV VC_ID=${VC_ID}