# HG changeset patch # User Richard Westhaver # Date 1718839521 14400 # Node ID 2e30626743f3c2590bf58943ebe80293bbecf032 # Parent 58539a178562e88ede24e410b62edf15aa5c92b2 mv box diff -r 58539a178562 -r 2e30626743f3 Containerfile.box --- a/Containerfile.box Wed Jun 19 17:36:52 2024 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -FROM localhost/archlinux:latest -RUN --network=host pacman -Sy uutils-coreutils sysstat iotop imagemagick giflib libgccjit libxaw snappy sbcl clang lld liburing libxkbcommon --noconfirm -# custom -ARG DEV=dev -ARG DEV_HOME=/home/${DEV} -ARG ID=808 -# stage0 -RUN mkdir -p /usr/share/lisp /usr/local/share/lisp /usr/local/share/rust -COPY .stash/bin/ /usr/local/bin/ -COPY .stash/lib/ /usr/local/lib/ -COPY .stash/include/ /usr/local/include/ -COPY .stash/share/ /usr/local/share/ -COPY .stash/src/ /usr/local/src/ -WORKDIR /usr/local/src -RUN hg clone https://vc.compiler.company/comp/infra -WORKDIR infra -ENV CARGO_HOME="/usr/local/share/rust/cargo" -ENV RUSTUP_HOME="/usr/local/share/rust/rustup" -# stage1 -ENV PATH="$PATH:/usr/local/share/rust/cargo/bin" -RUN skel run install-rocksdb-pack -RUN skel run install-emacs-mini-pack -RUN skel make tree-sitter -RUN skel make tree-sitter-langs -RUN useradd --system -s /usr/bin/bash -u ${ID} -m ${DEV} -RUN groupadd -g 128 engineer -U ${DEV} -RUN groupadd -g 256 operator -U ${DEV} -RUN chown -R ${DEV}:engineer /usr/local/share/ -RUN chown -R ${DEV}:engineer /usr/local/src/ -RUN chown -R ${DEV}:engineer /usr/local/bin/ -RUN chown -R ${DEV}:engineer /usr/local/etc/ -RUN chown -R ${DEV}:engineer /usr/local/man/ -USER ${DEV} -RUN mkdir ${DEV_HOME}/.stash -RUN skel make quicklisp -RUN skel make rustup -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/* -ENV DEV=${DEV} -ENV DEV_ID=${ID} \ No newline at end of file diff -r 58539a178562 -r 2e30626743f3 Containerfile.core --- a/Containerfile.core Wed Jun 19 17:36:52 2024 -0400 +++ b/Containerfile.core Wed Jun 19 19:25:21 2024 -0400 @@ -1,4 +1,4 @@ -ARG IMAGE=localhost/box +ARG IMAGE=localhost/dev ARG VERSION=latest FROM ${IMAGE}:${VERSION} RUN hg clone https://vc.compiler.company/comp/core diff -r 58539a178562 -r 2e30626743f3 Containerfile.dev --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Containerfile.dev Wed Jun 19 19:25:21 2024 -0400 @@ -0,0 +1,42 @@ +FROM localhost/archlinux:latest +RUN --network=host pacman -Sy uutils-coreutils sysstat iotop imagemagick giflib libgccjit libxaw snappy sbcl clang lld liburing libxkbcommon --noconfirm +# custom +ARG DEV=dev +ARG DEV_HOME=/home/${DEV} +ARG ID=808 +# stage0 +RUN mkdir -p /usr/share/lisp /usr/local/share/lisp /usr/local/share/rust +COPY .stash/bin/ /usr/local/bin/ +COPY .stash/lib/ /usr/local/lib/ +COPY .stash/include/ /usr/local/include/ +COPY .stash/share/ /usr/local/share/ +COPY .stash/src/ /usr/local/src/ +WORKDIR /usr/local/src +RUN hg clone https://vc.compiler.company/comp/infra +WORKDIR infra +ENV CARGO_HOME="/usr/local/share/rust/cargo" +ENV RUSTUP_HOME="/usr/local/share/rust/rustup" +# stage1 +ENV PATH="$PATH:/usr/local/share/rust/cargo/bin" +RUN skel run install-rocksdb-pack +RUN skel run install-emacs-mini-pack +RUN skel make tree-sitter +RUN skel make tree-sitter-langs +RUN useradd --system -s /usr/bin/bash -u ${ID} -m ${DEV} +RUN groupadd -g 128 engineer -U ${DEV} +RUN groupadd -g 256 operator -U ${DEV} +RUN chown -R ${DEV}:engineer /usr/local/share/ +RUN chown -R ${DEV}:engineer /usr/local/src/ +RUN chown -R ${DEV}:engineer /usr/local/bin/ +RUN chown -R ${DEV}:engineer /usr/local/etc/ +RUN chown -R ${DEV}:engineer /usr/local/man/ +USER ${DEV} +RUN mkdir ${DEV_HOME}/.stash +RUN skel make quicklisp +RUN skel make rustup +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/* +ENV DEV=${DEV} +ENV DEV_ID=${ID} \ No newline at end of file diff -r 58539a178562 -r 2e30626743f3 Containerfile.operator --- a/Containerfile.operator Wed Jun 19 17:36:52 2024 -0400 +++ b/Containerfile.operator Wed Jun 19 19:25:21 2024 -0400 @@ -1,2 +1,2 @@ -FROM localhost/box:latest +FROM localhost/dev:latest RUN /usr/local/src/infra/scripts/wg-gen-keys.sh private.key public.key \ No newline at end of file