changelog shortlog graph tags branches files raw help

Mercurial > infra > pod / changeset: updates

changeset 2: ebe8eace7f0a
parent 1: 0d37b97f681e
child 3: 759570e2f4d5
author: Richard Westhaver <ellis@rwest.io>
date: Sun, 16 Jun 2024 00:33:56 -0400
files: Containerfile.box Containerfile.worker
description: updates
     1.1--- a/Containerfile.box	Sun Jun 16 00:18:07 2024 -0400
     1.2+++ b/Containerfile.box	Sun Jun 16 00:33:56 2024 -0400
     1.3@@ -6,6 +6,11 @@
     1.4 ARG ID=808
     1.5 # stage0
     1.6 RUN mkdir -p /usr/share/lisp /usr/local/share/lisp
     1.7+COPY .stash/bin/ /usr/local/bin/
     1.8+COPY .stash/lib/ /usr/local/lib/
     1.9+COPY .stash/include/ /usr/local/include/
    1.10+COPY .stash/share/ /usr/local/share/
    1.11+COPY .stash/src/ /usr/local/src/
    1.12 WORKDIR /usr/local/src
    1.13 RUN hg clone https://vc.compiler.company/comp/infra
    1.14 RUN hg clone https://vc.compiler.company/comp/core
    1.15@@ -13,7 +18,6 @@
    1.16 ENV CARGO_HOME="/usr/local/share/cargo"
    1.17 ENV RUSTUP_HOME="/usr/local/share/rustup"
    1.18 # stage1
    1.19-RUN ./bootstrap.sh
    1.20 ENV PATH="$PATH:/usr/local/share/cargo/bin"
    1.21 RUN skel make rustup
    1.22 RUN rustup update
    1.23@@ -22,9 +26,9 @@
    1.24 RUN rustup component add --toolchain nightly rust-src rust-analyzer rustc-dev llvm-tools-preview
    1.25 # RUN skel make tree-sitter
    1.26 # RUN skel make tree-sitter-langs
    1.27-#ADD etc/sbclrc /etc/sbclrc
    1.28-#COPY etc/skel/ /etc/skel/
    1.29-#ADD etc/shells /etc/
    1.30+ADD etc/sbclrc /etc/sbclrc
    1.31+COPY etc/skel/ /etc/skel/
    1.32+ADD etc/shells /etc/
    1.33 RUN useradd --system -s /usr/bin/bash -u ${ID} -k /etc/skel -m ${DEV}
    1.34 RUN groupadd -g 128 engineer -U ${DEV}
    1.35 RUN groupadd -g 256 operator -U ${DEV}
    1.36@@ -39,7 +43,5 @@
    1.37 RUN rm -rf ./*
    1.38 WORKDIR ${DEV_HOME}
    1.39 RUN mkdir .stash
    1.40-RUN hg clone https://vc.compiler.company/comp/infra
    1.41-RUN hg clone https://vc.compiler.company/comp/core
    1.42 ENV DEV=${DEV}
    1.43 ENV DEV_ID=${ID}
    1.44\ No newline at end of file
     2.1--- a/Containerfile.worker	Sun Jun 16 00:18:07 2024 -0400
     2.2+++ b/Containerfile.worker	Sun Jun 16 00:33:56 2024 -0400
     2.3@@ -6,21 +6,20 @@
     2.4 ARG WORKER=worker
     2.5 ARG WORKER_HOME=/home/${WORKER}
     2.6 # TODO: build sbcl for musl
     2.7-RUN apk add build-base zstd-dev curl make git linux-headers openssl-dev pkgconf clang m4 tree-sitter sbcl
     2.8-RUN mkdir /usr/share/lisp
     2.9-RUN mkdir /usr/local/share/lisp
    2.10+RUN apk add build-base zstd-dev curl make git linux-headers openssl-dev pkgconf clang m4
    2.11+RUN mkdir -p /usr/share/lisp /usr/local/share/lisp
    2.12+COPY .stash/bin/ /usr/local/bin/
    2.13+COPY .stash/lib/ /usr/local/lib/
    2.14+COPY .stash/include/ /usr/local/include/
    2.15+COPY .stash/share/ /usr/local/share/
    2.16+COPY .stash/src/ /usr/local/src/
    2.17 WORKDIR /usr/local/src
    2.18 RUN hg clone https://vc.compiler.company/comp/infra
    2.19-RUN hg clone https://vc.compiler.company/comp/core
    2.20 WORKDIR infra
    2.21-RUN scripts/get-sk.sh
    2.22+# RUN scripts/get-sk.sh
    2.23 ENV CARGO_HOME="/usr/local/share/cargo"
    2.24 ENV RUSTUP_HOME="/usr/local/share/rustup"
    2.25 ENV PATH="$PATH:/usr/local/share/cargo/bin:/usr/local/share/lisp/bin"
    2.26-# RUN sk make sbcl sbcl-install quicklisp rustup tree-sitter-langs rocksdb
    2.27-RUN make sbcl-install-gencgc
    2.28-RUN make quicklisp-install
    2.29-RUN make rocksdb-install
    2.30 RUN adduser -D -u ${ID} -k /etc/skel ${WORKER}
    2.31 USER ${WORKER}
    2.32 WORKDIR ${WORKER_HOME}