changeset 41: |
21e3a05f8c27 |
parent 40: |
1fa1b579bb09 |
child 42: |
36c0358a46be |
author: |
ellis <ellis@rwest.io> |
date: |
Sun, 31 Dec 2023 00:03:09 -0500 |
files: |
makefile virt/build-alpine-base.sh virt/build-demo.sh |
description: |
> |
1.1--- a/makefile Sat Dec 30 23:55:53 2023 -0500
1.2+++ b/makefile Sun Dec 31 00:03:09 2023 -0500
1.3@@ -101,7 +101,7 @@
1.4
1.5 ### Tree-sitter Langs
1.6 TS_LANGS_TARGET:=build/src/ts-langs
1.7-ts-langs-install:scripts/ts-install-langs.sh # this requires sudo for now
1.8+ts-langs-install:scripts/ts-install-langs.sh
1.9 $<
1.10 ### Comp
1.11 COMP_TARGET:=build/src/$(SRC)
1.12@@ -151,7 +151,7 @@
1.13 dist/rocksdb:rocksdb $(D);
1.14 mkdir -pv $@
1.15 cp -rf $(ROCKSDB_TARGET)/include/* $@
1.16- cp -f $(ROCKSDB_TARGET)/librocksdb.{so,dylib}* $@
1.17+ cp -f $(ROCKSDB_TARGET)/librocksdb.* $@
1.18
1.19 dist/rust:rust-build $(D);
1.20 cd $(RUST_TARGET) && x dist
2.1--- a/virt/build-alpine-base.sh Sat Dec 30 23:55:53 2023 -0500
2.2+++ b/virt/build-alpine-base.sh Sun Dec 31 00:03:09 2023 -0500
2.3@@ -1,6 +1,6 @@
2.4 #!/usr/bin/env bash
2.5 id=$(buildah from --pull alpine:latest)
2.6-buildah run --net host $id apk add --no-cache gnupg openssh mercurial wireguard-tools
2.7+buildah run --net host $id apk add --no-cache openssh mercurial wireguard-tools
2.8 buildah config --annotation alpine $id
2.9 buildah config --author='Richard Westhaver' $id
2.10 buildah commit $id alpine-base
3.1--- a/virt/build-demo.sh Sat Dec 30 23:55:53 2023 -0500
3.2+++ b/virt/build-demo.sh Sun Dec 31 00:03:09 2023 -0500
3.3@@ -1,12 +1,8 @@
3.4 #!/usr/bin/env bash
3.5 id=$(buildah from alpine-base)
3.6+buildah copy $id etc/skel /etc/skel
3.7+buildah run $id adduser demo -D
3.8 buildah config --workingdir /home/demo $id
3.9 buildah config -l=demo $id
3.10-buildah run $id adduser demo
3.11-buildah copy $id dist/sbcl /home/demo/sbcl
3.12-buildah copy $id dist/fasl/ /home/demo/fasl
3.13-buildah copy $id dist/rocksdb/librocksdb.so /usr/local/lib/
3.14-# buildah copy $id dist/tree-sitter/grammar/* /usr/local/share/tree-sitter/
3.15-# cleanup
3.16 # buildah config --entrypoint
3.17 buildah commit $id demo