changeset 42: |
be286d8b2764 |
parent 41: |
7b2e34e1c161 |
tag: | tip |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Sat, 28 Sep 2024 16:49:18 -0400 |
files: |
Containerfile.dev Containerfile.emacs Containerfile.operator |
description: |
emacs fixes |
1.1--- a/Containerfile.dev Tue Sep 24 15:53:20 2024 -0400
1.2+++ b/Containerfile.dev Sat Sep 28 16:49:18 2024 -0400
1.3@@ -40,7 +40,7 @@
1.4 RUN rustup component add --toolchain nightly rust-src rust-analyzer rustc-dev llvm-tools-preview
1.5 WORKDIR ${DEV_HOME}
1.6 RUN rm -rf ${DEV_HOME}/.stash/*
1.7-RUN hg clone https://vc.compiler.company/home .stash/home && cd .stash/home && hg up ${DEV}
1.8+RUN hg clone https://vc.compiler.company/infra/home .stash/home && cd .stash/home && hg up ${DEV}
1.9 RUN cp .stash/home/.homerc ${DEV_HOME}/.homerc
1.10 RUN homer install
1.11 ENV DEV=${DEV}
2.1--- a/Containerfile.emacs Tue Sep 24 15:53:20 2024 -0400
2.2+++ b/Containerfile.emacs Sat Sep 28 16:49:18 2024 -0400
2.3@@ -1,5 +1,5 @@
2.4 FROM localhost/operator:latest
2.5 # bootstrap
2.6-RUN emacs --load ~/.emacs.d/init.el --kill
2.7+RUN emacs --batch --load ~/.emacs.d/init.el --kill
2.8 ENTRYPOINT [ "emacs" ]
2.9
3.1--- a/Containerfile.operator Tue Sep 24 15:53:20 2024 -0400
3.2+++ b/Containerfile.operator Sat Sep 28 16:49:18 2024 -0400
3.3@@ -4,18 +4,20 @@
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/infra .stash/infra
3.10 RUN hg clone https://vc.compiler.company/core .stash/core
3.11 RUN .stash/infra/scripts/wg-gen-keys.sh private.key public.key
3.12+RUN mkdir .emacs.d
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+RUN mkdir -pv ~/.stash/tmp
3.22+RUN cd core/emacs && skel make install
3.23 USER root
3.24 RUN rm -rf .stash/core .stash/infra
3.25 USER operator