changeset 12: |
a67e164d4def |
parent 11: |
e3e55e6b2f64 |
child 13: |
43c84d8fb729 |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Thu, 04 Jul 2024 23:47:28 -0400 |
files: |
Containerfile.dev Containerfile.worker skelfile |
description: |
not quite |
1.1--- a/Containerfile.dev Thu Jun 20 22:31:28 2024 -0400
1.2+++ b/Containerfile.dev Thu Jul 04 23:47:28 2024 -0400
1.3@@ -6,17 +6,18 @@
1.4 ARG ID=808
1.5 # stage0
1.6 RUN mkdir -p /usr/share/lisp /usr/local/share/lisp /usr/local/share/rust
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+# COPY .stash/bin/ /usr/local/bin/
1.13+# COPY .stash/lib/ /usr/local/lib/
1.14+# COPY .stash/include/ /usr/local/include/
1.15+# COPY .stash/share/ /usr/local/share/
1.16+# COPY .stash/src/ /usr/local/src/
1.17 WORKDIR /usr/local/src
1.18 RUN hg clone https://vc.compiler.company/comp/infra
1.19 WORKDIR infra
1.20 ENV CARGO_HOME="/usr/local/share/rust/cargo"
1.21 ENV RUSTUP_HOME="/usr/local/share/rust/rustup"
1.22 # stage1
1.23+RUN ./bootstrap.sh
1.24 ENV PATH="$PATH:/usr/local/share/rust/cargo/bin"
1.25 RUN skel run install-rocksdb-pack
1.26 RUN skel run install-emacs-mini-pack
2.1--- a/Containerfile.worker Thu Jun 20 22:31:28 2024 -0400
2.2+++ b/Containerfile.worker Thu Jul 04 23:47:28 2024 -0400
2.3@@ -5,15 +5,14 @@
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 m4 hg
2.8+RUN apk add build-base zstd-dev curl make git linux-headers openssl-dev pkgconf m4 mercurial
2.9 RUN mkdir -p /usr/share/lisp /usr/local/share/lisp
2.10-COPY .stash/bin/ /usr/local/bin/
2.11-COPY .stash/lib/ /usr/local/lib/
2.12-COPY .stash/include/ /usr/local/include/
2.13-COPY .stash/share/ /usr/local/share/
2.14-COPY .stash/src/ /usr/local/src/
2.15-WORKDIR /usr/local/src/sbcl
2.16-
2.17+# COPY .stash/bin/ /usr/local/bin/
2.18+# COPY .stash/lib/ /usr/local/lib/
2.19+# COPY .stash/include/ /usr/local/include/
2.20+# COPY .stash/share/ /usr/local/share/
2.21+# COPY .stash/src/ /usr/local/src/
2.22+# WORKDIR /usr/local/src/sbcl
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"
3.1--- a/skelfile Thu Jun 20 22:31:28 2024 -0400
3.2+++ b/skelfile Thu Jul 04 23:47:28 2024 -0400
3.3@@ -2,9 +2,9 @@
3.4 :name "pod"
3.5 :author "Richard Westhaver"
3.6 :version "0.1.0"
3.7-:vc :hg
3.8-:rules ()
3.9-:docs ()
3.10-:scripts ()
3.11-:imports ()
3.12-
3.13+:vc (:hg "https://vc.compiler.company/comp/pod")
3.14+:rules
3.15+((all ())
3.16+ (dev () #$podman build -f Containerfile.dev$#))
3.17+:components
3.18+((:containerfile "dev"))