changeset 40: |
90970dfd5a8b |
parent 39: |
c0ed453c44f9 |
child 41: |
7b2e34e1c161 |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Tue, 24 Sep 2024 15:02:27 -0400 |
files: |
Containerfile.dev Containerfile.emacs Containerfile.operator Containerfile.org skelfile |
description: |
merge |
1.1--- a/Containerfile.dev Fri Sep 13 20:18:24 2024 -0400
1.2+++ b/Containerfile.dev Tue Sep 24 15:02:27 2024 -0400
1.3@@ -24,9 +24,11 @@
1.4 ENV CARGO_HOME="/usr/local/share/rust/cargo"
1.5 ENV RUSTUP_HOME="/usr/local/share/rust/rustup"
1.6 RUN ./bootstrap.sh
1.7-RUN mv .stash/bin/skel /usr/local/bin/skel
1.8+RUN mv .stash/bin/core /usr/local/bin/core
1.9+RUN ln -sf /usr/local/bin/core /usr/local/bin/skel
1.10+RUN ln -sf /usr/local/bin/core /usr/local/bin/homer
1.11 ENV PATH="$PATH:/usr/local/share/rust/cargo/bin"
1.12-RUN skel run install-rocksdb-pack
1.13+RUN ./scripts/install-rocksdb-pack.sh
1.14 RUN skel build tree-sitter
1.15 RUN skel install tree-sitter tree-sitter-langs
1.16 RUN mv .stash/lib/** /usr/local/lib/
2.1--- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2+++ b/Containerfile.emacs Tue Sep 24 15:02:27 2024 -0400
2.3@@ -0,0 +1,5 @@
2.4+FROM localhost/operator:latest
2.5+# bootstrap
2.6+RUN emacs --load ~/.emacs.d/init.el --kill
2.7+ENTRYPOINT [ "emacs" ]
2.8+
3.1--- a/Containerfile.operator Fri Sep 13 20:18:24 2024 -0400
3.2+++ b/Containerfile.operator Tue Sep 24 15:02:27 2024 -0400
3.3@@ -4,15 +4,21 @@
3.4 RUN echo "operator ALL=(ALL:ALL) NOPASSWD: ALL" | sudo tee /etc/sudoers.d/operator
3.5 RUN --network=host pacman -Sy aspell hunspell-en_us --noconfirm
3.6 RUN pacman -Scc --noconfirm
3.7-USER operator
3.8 WORKDIR /home/operator
3.9-RUN hg clone https://vc.compiler.company/comp/infra .stash/infra
3.10+RUN hg clone https://vc.compiler.company/infra .stash/infra
3.11+RUN hg clone https://vc.compiler.company/core .stash/core
3.12 RUN .stash/infra/scripts/wg-gen-keys.sh private.key public.key
3.13 WORKDIR .stash/infra
3.14 RUN mkdir -pv .stash/tmp
3.15 RUN sudo skel build emacs
3.16 RUN sudo skel install emacs
3.17 RUN sudo skel clean
3.18+WORKDIR /home/operator/.stash
3.19+USER operator
3.20+RUN cd core/emacs && make
3.21+USER root
3.22+RUN rm -rf .stash/core .stash/infra
3.23+USER operator
3.24 WORKDIR /home/operator
3.25 RUN cd .stash/home && hg up operator && homer install
3.26 ENV DEV=operator
4.1--- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2+++ b/Containerfile.org Tue Sep 24 15:02:27 2024 -0400
4.3@@ -0,0 +1,3 @@
4.4+FROM localhost/emacs:latest
4.5+RUN hg clone https://vc.compiler.company/org org
4.6+WORKDIR org
5.1--- a/skelfile Fri Sep 13 20:18:24 2024 -0400
5.2+++ b/skelfile Tue Sep 24 15:02:27 2024 -0400
5.3@@ -52,6 +52,11 @@
5.4 (dev ()
5.5 (:build () #$podman build -f Containerfile.dev -t dev --no-cache$#)
5.6 (:run () #$podman run --name dev --replace -dt dev$#))
5.7+ (emacs ()
5.8+ (:build () #$podman build -f Containerfile.emacs -t emacs --no-cache$#)
5.9+ (:run () #$podman run --name emacs --replace -it emacs$#))
5.10+ (org ()
5.11+ (:build () #$podman build -f Containerfile.org -t org --no-cache$#))
5.12 (archlinux ()
5.13 (:build () #$podman build -f Containerfile.archlinux -t archlinux --no-cache$#)
5.14 (:run () #$podman run --name archlinux --replace -dt archlinux$#)