changeset 237: |
c1b5c4d68e2b |
parent 236: |
7f1d2001df1d |
child 238: |
489ae684b01a |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Mon, 27 May 2024 22:37:51 +0000 |
files: |
.hgsubstate containers/Containerfile.alpine containers/Containerfile.worker makefile |
description: |
alpine tweaks |
1.1--- a/.hgsubstate Mon May 27 04:15:48 2024 +0000
1.2+++ b/.hgsubstate Mon May 27 22:37:51 2024 +0000
1.3@@ -1,2 +1,2 @@
1.4 d5b76348e00ed20d362eb1a4109abd45a784cd7b etc
1.5-13e2311f62218eb153de54dd7c51e422567df0ed home
1.6+411f423567fcee89ca7f50fbeca938ada70c2cf1 home
2.1--- a/containers/Containerfile.alpine Mon May 27 04:15:48 2024 +0000
2.2+++ b/containers/Containerfile.alpine Mon May 27 22:37:51 2024 +0000
2.3@@ -1,2 +1,2 @@
2.4 FROM alpine:latest
2.5-RUN apk add --no-cache openssh mercurial wireguard-tools liburing
2.6\ No newline at end of file
2.7+RUN apk add --no-cache openssh mercurial wireguard-tools liburing libc6-compat coreutils
2.8\ No newline at end of file
3.1--- a/containers/Containerfile.worker Mon May 27 04:15:48 2024 +0000
3.2+++ b/containers/Containerfile.worker Mon May 27 22:37:51 2024 +0000
3.3@@ -5,22 +5,19 @@
3.4 ARG ID=908
3.5 ARG WORKER=worker
3.6 ARG WORKER_HOME=/home/${WORKER}
3.7-RUN apk add build-base zstd-dev curl make git linux-headers openssl-dev pkgconf clang m4 tree-sitter
3.8+# TODO: build sbcl for musl
3.9+RUN apk add build-base zstd-dev curl make git linux-headers openssl-dev pkgconf clang m4 tree-sitter sbcl
3.10 RUN mkdir /usr/share/lisp
3.11 RUN mkdir /usr/local/share/lisp
3.12 WORKDIR /usr/local/src
3.13 RUN hg clone https://vc.compiler.company/comp/infra
3.14 WORKDIR infra
3.15-RUN mkdir -pv .stash
3.16-RUN sh scripts/get-sk.sh
3.17+RUN scripts/get-sk.sh
3.18 ENV CARGO_HOME="/usr/local/share/cargo"
3.19 ENV RUSTUP_HOME="/usr/local/share/rustup"
3.20-RUN exec .stash/sk make rustup
3.21-RUN exec .stash/sk make tree-sitter-langs
3.22-ENV PATH="$PATH:/usr/local/share/cargo/bin"
3.23-RUN rustup update
3.24-RUN rustup default nightly
3.25-RUN cd .. && rm -rf infra core
3.26+ENV PATH="$PATH:/usr/local/share/cargo/bin:/usr/local/share/lisp/bin"
3.27+# RUN sk make sbcl sbcl-install quicklisp rustup tree-sitter-langs rocksdb
3.28+RUN make sbcl-install-gencgc
3.29 RUN adduser -D -u ${ID} -k /etc/skel ${WORKER}
3.30 USER ${WORKER}
3.31 WORKDIR ${WORKER_HOME}
4.1--- a/makefile Mon May 27 04:15:48 2024 +0000
4.2+++ b/makefile Mon May 27 22:37:51 2024 +0000
4.3@@ -115,6 +115,7 @@
4.4 sbcl-docs:sbcl-build;## REQUIRES TEXLIVE
4.5 cd $(SBCL_TARGET)/doc/manual && make
4.6 sbcl-install:sbcl-build;cd $(SBCL_TARGET) && INSTALL_ROOT=/usr/local sh install.sh
4.7+sbcl-install-gencgc:sbcl-build-gencgc;cd $(SBCL_TARGET) && INSTALL_ROOT=/usr/local sh install.sh
4.8 clean-sbcl:$(SBCL_TARGET);cd $(SBCL_TARGET) && ./clean.sh
4.9
4.10 .stash/quicklisp.lisp:$(B);cd $< && curl -O https://beta.quicklisp.org/quicklisp.lisp