# HG changeset patch # User Richard Westhaver # Date 1720151248 14400 # Node ID a67e164d4defe3f121a3da96959f238d79fad578 # Parent e3e55e6b2f644d9862d8309f605afaea199c8b7c not quite diff -r e3e55e6b2f64 -r a67e164d4def Containerfile.dev --- a/Containerfile.dev Thu Jun 20 22:31:28 2024 -0400 +++ b/Containerfile.dev Thu Jul 04 23:47:28 2024 -0400 @@ -6,17 +6,18 @@ 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/ +# 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 +RUN ./bootstrap.sh ENV PATH="$PATH:/usr/local/share/rust/cargo/bin" RUN skel run install-rocksdb-pack RUN skel run install-emacs-mini-pack diff -r e3e55e6b2f64 -r a67e164d4def Containerfile.worker --- a/Containerfile.worker Thu Jun 20 22:31:28 2024 -0400 +++ b/Containerfile.worker Thu Jul 04 23:47:28 2024 -0400 @@ -5,15 +5,14 @@ ARG WORKER=worker ARG WORKER_HOME=/home/${WORKER} # TODO: build sbcl for musl -RUN apk add build-base zstd-dev curl make git linux-headers openssl-dev pkgconf m4 hg +RUN apk add build-base zstd-dev curl make git linux-headers openssl-dev pkgconf m4 mercurial RUN mkdir -p /usr/share/lisp /usr/local/share/lisp -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/sbcl - +# 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/sbcl ENV CARGO_HOME="/usr/local/share/cargo" ENV RUSTUP_HOME="/usr/local/share/rustup" ENV PATH="$PATH:/usr/local/share/cargo/bin:/usr/local/share/lisp/bin" diff -r e3e55e6b2f64 -r a67e164d4def skelfile --- a/skelfile Thu Jun 20 22:31:28 2024 -0400 +++ b/skelfile Thu Jul 04 23:47:28 2024 -0400 @@ -2,9 +2,9 @@ :name "pod" :author "Richard Westhaver" :version "0.1.0" -:vc :hg -:rules () -:docs () -:scripts () -:imports () - +:vc (:hg "https://vc.compiler.company/comp/pod") +:rules +((all ()) + (dev () #$podman build -f Containerfile.dev$#)) +:components +((:containerfile "dev"))