# HG changeset patch # User Richard Westhaver # Date 1720379440 14400 # Node ID 21250ff5559ce53aa8ae64c231f08853f3123734 # Parent 6cb3bf451afc176e0940051e00611437a738e7eb tweaks diff -r 6cb3bf451afc -r 21250ff5559c Containerfile.dev --- a/Containerfile.dev Sun Jul 07 02:00:14 2024 -0400 +++ b/Containerfile.dev Sun Jul 07 15:10:40 2024 -0400 @@ -1,16 +1,9 @@ FROM localhost/archlinux:latest RUN --network=host pacman -Sy uutils-coreutils sysstat iotop imagemagick giflib libgccjit libxaw snappy sbcl llvm clang lld liburing libxkbcommon --noconfirm -# custom ARG DEV=dev ARG DEV_HOME=/home/${DEV} ARG DEV_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/ RUN useradd --system -s /usr/bin/bash -u ${DEV_ID} -m ${DEV} RUN groupadd -g 128 engineer -U ${DEV} RUN groupadd -g 256 operator -U ${DEV} @@ -19,6 +12,7 @@ RUN chown -R ${DEV}:engineer /usr/local/bin/ RUN chown -R ${DEV}:engineer /usr/local/etc/ RUN chown -R ${DEV}:engineer /usr/local/lib/ +RUN chown -R ${DEV}:engineer /usr/local/include/ RUN chown -R ${DEV}:engineer /usr/local/man/ USER ${DEV} RUN mkdir ${DEV_HOME}/.stash @@ -27,16 +21,16 @@ WORKDIR infra ENV CARGO_HOME="/usr/local/share/rust/cargo" ENV RUSTUP_HOME="/usr/local/share/rust/rustup" -# stage1 RUN ./bootstrap.sh -RUN install -m 755 .stash/bin/* /usr/local/bin/ -RUN mv .stash/lib/** /usr/local/lib/ -RUN mv .stash/share/lisp/** /usr/local/share/lisp/ +RUN mv .stash/bin/skel /usr/local/bin/skel ENV PATH="$PATH:/usr/local/share/rust/cargo/bin" RUN skel run install-rocksdb-pack RUN skel make tree-sitter RUN skel make tree-sitter-install RUN skel make tree-sitter-langs +RUN mv .stash/lib/** /usr/local/lib/ +RUN mv .stash/share/lisp/** /usr/local/share/lisp/ +RUN mv .stash/bin/* /usr/local/bin/ RUN skel make quicklisp RUN skel make rustup RUN rustup default nightly