changeset 5: |
f2244a1fa02f |
parent 4: |
65b548b0ce40 |
child 6: |
6444650c52f2 |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Sun, 16 Jun 2024 23:52:49 +0000 |
files: |
Containerfile.archlinux Containerfile.box |
description: |
fixes |
1.1--- a/Containerfile.archlinux Sun Jun 16 05:01:49 2024 +0000
1.2+++ b/Containerfile.archlinux Sun Jun 16 23:52:49 2024 +0000
1.3@@ -1,4 +1,4 @@
1.4 FROM archlinux:latest
1.5 RUN --network=host pacman-key --init
1.6 RUN --network=host pacman-key --populate archlinux
1.7-RUN --network=host pacman -Syu base-devel less uutils-coreutils openssh mercurial git sqlite btrfs-progs liburing wireguard-tools clang tree-sitter libxcb glibc openssl zstd --noconfirm
1.8\ No newline at end of file
1.9+RUN --network=host pacman -Syu base-devel less uutils-coreutils openssl openssh mercurial git liburing wireguard-tools clang libxcb zstd --noconfirm
1.10\ No newline at end of file
2.1--- a/Containerfile.box Sun Jun 16 05:01:49 2024 +0000
2.2+++ b/Containerfile.box Sun Jun 16 23:52:49 2024 +0000
2.3@@ -5,7 +5,7 @@
2.4 ARG DEV_HOME=/home/${DEV}
2.5 ARG ID=808
2.6 # stage0
2.7-RUN mkdir -p /usr/share/lisp /usr/local/share/lisp
2.8+RUN mkdir -p /usr/share/lisp /usr/local/share/lisp /usr/local/share/rust
2.9 COPY .stash/bin/ /usr/local/bin/
2.10 COPY .stash/lib/ /usr/local/lib/
2.11 COPY .stash/include/ /usr/local/include/
2.12@@ -14,17 +14,15 @@
2.13 WORKDIR /usr/local/src
2.14 RUN hg clone https://vc.compiler.company/comp/infra
2.15 WORKDIR infra
2.16-ENV CARGO_HOME="/usr/local/share/cargo"
2.17-ENV RUSTUP_HOME="/usr/local/share/rustup"
2.18+ENV CARGO_HOME="/usr/local/share/rust/cargo"
2.19+ENV RUSTUP_HOME="/usr/local/share/rust/rustup"
2.20 # stage1
2.21-ENV PATH="$PATH:/usr/local/share/cargo/bin"
2.22+ENV PATH="$PATH:/usr/local/share/rust/cargo/bin"
2.23 RUN skel make rustup
2.24-RUN rustup update
2.25-# dev rustc components
2.26 RUN rustup default nightly
2.27 RUN rustup component add --toolchain nightly rust-src rust-analyzer rustc-dev llvm-tools-preview
2.28-# RUN skel make tree-sitter
2.29-# RUN skel make tree-sitter-langs
2.30+RUN skel make tree-sitter
2.31+RUN skel make tree-sitter-langs
2.32 RUN useradd --system -s /usr/bin/bash -u ${ID} -k /etc/skel -m ${DEV}
2.33 RUN groupadd -g 128 engineer -U ${DEV}
2.34 RUN groupadd -g 256 operator -U ${DEV}
2.35@@ -33,11 +31,10 @@
2.36 RUN chown -R ${DEV}:engineer /usr/local/bin/
2.37 RUN chown -R ${DEV}:engineer /usr/local/etc/
2.38 RUN chown -R ${DEV}:engineer /usr/local/man/
2.39-WORKDIR /usr/local/src
2.40 USER ${DEV}
2.41-# RUN cp -rf core/lisp /usr/local/share/lisp/core
2.42-RUN rm -rf ./infra/.stas*
2.43+RUN mkdir ${DEV_HOME}/.stash
2.44+RUN skel make clean
2.45+RUN skel make quicklisp
2.46 WORKDIR ${DEV_HOME}
2.47-RUN mkdir .stash
2.48 ENV DEV=${DEV}
2.49 ENV DEV_ID=${ID}
2.50\ No newline at end of file