changeset 105: |
abdf549818d5 |
parent 104: |
07ba504fc720 |
child 106: |
86b6b3b37304 |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Sun, 14 Jan 2024 21:42:16 -0500 |
files: |
Containerfile.archlinux Containerfile.box Containerfile.ci-worker makefile |
description: |
added box |
1.1--- a/Containerfile.archlinux Sun Jan 14 20:46:44 2024 -0500
1.2+++ b/Containerfile.archlinux Sun Jan 14 21:42:16 2024 -0500
1.3@@ -1,10 +1,5 @@
1.4 FROM archlinux:latest
1.5 COPY etc/skel/ /etc/
1.6-RUN --network=host pacman -Syu gnupg openssh mercurial sqlite tmux btrfs-progs liburing wireguard-tools --noconfirm
1.7 RUN useradd -u 1000 demon
1.8 RUN useradd -u 1001 alik
1.9-RUN mkdir /usr/share/lisp
1.10-RUN mkdir /usr/local/share/lisp
1.11-COPY etc/sbclrc /etc/sbclrc
1.12-ENV XDG_RUNTIME_DIR=/run/user/1000
1.13-EXPOSE 8080
1.14\ No newline at end of file
1.15+ENV XDG_RUNTIME_DIR=/run/user/1000
1.16\ No newline at end of file
2.1--- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2+++ b/Containerfile.box Sun Jan 14 21:42:16 2024 -0500
2.3@@ -0,0 +1,18 @@
2.4+FROM localhost/archlinux
2.5+VOLUME /store
2.6+VOLUME /stash
2.7+COPY etc/skel /etc/
2.8+RUN mkdir /usr/share/lisp
2.9+RUN mkdir /usr/local/share/lisp
2.10+RUN --network=host pacman -Syu gnupg openssh mercurial sqlite tmux btrfs-progs liburing wireguard-tools --noconfirm
2.11+WORKDIR /usr/local/src
2.12+RUN hg clone https://vc.compiler.company/comp/infra
2.13+RUN hg clone https://vc.compiler.company/comp/demo
2.14+RUN hg clone https://vc.compiler.company/comp/org
2.15+RUN hg clone https://vc.compiler.company/comp/core
2.16+WORKDIR infra
2.17+RUN make box -j4
2.18+RUN make clean
2.19+COPY etc/sbclrc /etc/sbclrc
2.20+EXPOSE 8080
2.21+
3.1--- a/Containerfile.ci-worker Sun Jan 14 20:46:44 2024 -0500
3.2+++ b/Containerfile.ci-worker Sun Jan 14 21:42:16 2024 -0500
3.3@@ -11,6 +11,5 @@
3.4 RUN hg clone https://vc.compiler.company/comp/core
3.5 WORKDIR infra
3.6 RUN make worker -j4
3.7-RUN scripts/install-cargo-tools.sh
3.8 RUN make clean
3.9 COPY etc/sbclrc /etc/sbclrc
3.10\ No newline at end of file
4.1--- a/makefile Sun Jan 14 20:46:44 2024 -0500
4.2+++ b/makefile Sun Jan 14 21:42:16 2024 -0500
4.3@@ -20,7 +20,8 @@
4.4 HG_COMMIT:=$(shell hg id -i)
4.5 DESTINATION:=/mnt/y/data/packy
4.6 # requires emacs-build-minimal
4.7-worker:sbcl-install quicklisp-install ts-langs-install # rocksdb-build-shared rocksdb-install
4.8+worker:sbcl-install quicklisp-install
4.9+box:sbcl-install quicklisp-install ts-langs-install rocksdb-build-shared rocksdb-build-static rocksdb-install emacs-build emacs-install core-install cargo-tools-install
4.10 # artifacts can deploy to dist/TARGET - need target triple first
4.11 # init:sbcl rust emacs rocksdb code
4.12 # dist/linux dist/rust dist/bundle
4.13@@ -125,7 +126,8 @@
4.14 cd $(RUST_TARGET) && x build --stage 2 compiler/rustc
4.15 rust-install:rust-build;
4.16 cd $(RUST_TARGET) && x install
4.17-
4.18+cargo-tools-install:scripts/install-cargo-tools.sh
4.19+ $<
4.20 ### Tree-sitter Langs
4.21 TS_LANGS_TARGET:=build/src/ts-langs
4.22 ts-langs-install:scripts/ts-install-langs.sh