changeset 23: |
ce053bf5ea3c |
parent 22: |
bd872fae61db |
child 24: |
b97af2c62373 |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Sun, 21 Jul 2024 01:46:51 -0400 |
files: |
Containerfile.dev Containerfile.vc |
description: |
vc updates |
1.1--- a/Containerfile.dev Mon Jul 08 20:49:05 2024 -0400
1.2+++ b/Containerfile.dev Sun Jul 21 01:46:51 2024 -0400
1.3@@ -17,7 +17,7 @@
1.4 RUN ssh-keygen -A
1.5 USER ${DEV}
1.6 RUN mkdir ${DEV_HOME}/.stash
1.7-WORKDIR /usr/local/src
1.8+WORKDIR ${DEV_HOME}/.stash
1.9 RUN hg clone https://vc.compiler.company/comp/infra
1.10 WORKDIR infra
1.11 ENV CARGO_HOME="/usr/local/share/rust/cargo"
1.12@@ -37,7 +37,7 @@
1.13 RUN rustup default nightly
1.14 RUN rustup component add --toolchain nightly rust-src rust-analyzer rustc-dev llvm-tools-preview
1.15 WORKDIR ${DEV_HOME}
1.16-RUN rm -rf /usr/local/src/*
1.17+RUN rm -rf ${DEV_HOME}/.stash/*
1.18 ENV DEV=${DEV}
1.19 ENV DEV_ID=${DEV_ID}
1.20 ENTRYPOINT ["/usr/bin/bash"]
1.21\ No newline at end of file
2.1--- a/Containerfile.vc Mon Jul 08 20:49:05 2024 -0400
2.2+++ b/Containerfile.vc Sun Jul 21 01:46:51 2024 -0400
2.3@@ -1,10 +1,22 @@
2.4-FROM localhost/box:latest
2.5+FROM localhost/dev:latest
2.6+USER root
2.7 ARG VC_USER=vc
2.8 ARG VC_HOME=/home/${VC_USER}
2.9 ARG VC_ID=842
2.10-RUN useradd --system -s /usr/bin/bash -u ${ID} -m ${DEV}
2.11-RUN infra/scripts/wg-gen-keys.sh private.key public.key
2.12-RUN mkdir ${VC_HOME}/.stash
2.13+RUN useradd --system -s /usr/bin/bash -u ${VC_ID} -m ${VC_USER}
2.14+USER ${VC_USER}
2.15+WORKDIR ${VC_HOME}
2.16+RUN mkdir .stash
2.17+RUN hg clone https://vc.compiler.company/comp/infra .stash/infra
2.18+RUN .stash/infra/scripts/wg-gen-keys.sh private.key public.key
2.19+RUN hg clone https://vc.compiler.company/comp/home .stash/home
2.20+RUN cd .stash/home && hg up ${VC_USER}
2.21+RUN cp -rf .stash/home/* ~/
2.22+WORKDIR .stash/infra
2.23+RUN skel make repos
2.24+RUN skel make packy-repos
2.25+RUN mv .stash/src ${VC_HOME}/src
2.26+RUN skel clean
2.27 WORKDIR ${VC_HOME}
2.28 ENV VC_USER=${VC_USER}
2.29 ENV VC_ID=${VC_ID}
2.30\ No newline at end of file