changeset 152: |
42dad35b9a1b |
parent 151: |
e9aed0513a18 |
child 153: |
b84ee4e47d2a |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Fri, 26 Jan 2024 18:23:23 -0500 |
files: |
Containerfile.box Containerfile.operator Containerfile.worker etc/nushell/config.nu |
description: |
user updates |
1.1--- a/Containerfile.box Thu Jan 25 23:21:01 2024 -0500
1.2+++ b/Containerfile.box Fri Jan 26 18:23:23 2024 -0500
1.3@@ -1,9 +1,6 @@
1.4 FROM infra/archlinux
1.5 VOLUME /store
1.6 VOLUME /stash
1.7-ADD etc/skel/* /etc/skel/
1.8-ADD etc/nushell/* /etc/nushell/
1.9-ADD etc/shells /etc/
1.10 # custom
1.11 ARG DEV=dev
1.12 ARG DEV_HOME=/home/${DEV}
1.13@@ -31,9 +28,16 @@
1.14 ADD etc/sbclrc /etc/sbclrc
1.15 RUN make core-install
1.16 RUN cd .. && rm -rf infra core
1.17-WORKDIR /usr/local/src
1.18+ADD etc/skel/* /etc/skel/
1.19+ADD etc/nushell/* /etc/nushell/
1.20+ADD etc/shells /etc/
1.21 RUN useradd --system -s /usr/local/bin/nu -u ${ID} -k /etc/skel -m ${DEV}
1.22 RUN groupadd -g 128 engineer -U ${DEV}
1.23 RUN groupadd -g 256 operator -U ${DEV}
1.24+USER ${DEV}
1.25 WORKDIR ${DEV_HOME}
1.26-ENTRYPOINT ["/usr/local/bin/nu", "--config", "/etc/nushell/config.nu", "--env-config", "/etc/nushell/env.nu"]
1.27\ No newline at end of file
1.28+RUN hg clone https://vc.compiler.company/comp/infra
1.29+ENV DEV_USER=${DEV}
1.30+ENV DEV_ID=${ID}
1.31+ENTRYPOINT ["/usr/local/bin/nu", "--config", "/etc/nushell/config.nu", "--env-config", "/etc/nushell/env.nu"]
1.32+CMD ["-i"]
2.1--- a/Containerfile.operator Thu Jan 25 23:21:01 2024 -0500
2.2+++ b/Containerfile.operator Fri Jan 26 18:23:23 2024 -0500
2.3@@ -1,9 +1,4 @@
2.4-FROM infra/worker
2.5-RUN apk add --no-cache tree-sitter-dev autoconf texinfo libgccjit-dev zlib-dev gnutls-dev sysprof gpg bash json-c-dev ncurses-dev zstd-dev
2.6-WORKDIR /usr/local/src/core
2.7-RUN hg pull -u
2.8-RUN hg clean
2.9-WORKDIR /usr/local/src/infra
2.10-RUN hg pull -u
2.11-RUN make clean
2.12-WORKDIR /
2.13\ No newline at end of file
2.14+FROM infra/box
2.15+USER root
2.16+RUN /home/${DEV_USER}/infra/scripts/wg-gen-keys.sh /etc/wireguard/private.key /etc/wireguard/public.key
2.17+USER ${DEV_USER}
2.18\ No newline at end of file
3.1--- a/Containerfile.worker Thu Jan 25 23:21:01 2024 -0500
3.2+++ b/Containerfile.worker Fri Jan 26 18:23:23 2024 -0500
3.3@@ -1,10 +1,10 @@
3.4 FROM infra/alpine
3.5 VOLUME /store
3.6 VOLUME /stash
3.7-ADD etc/skel /etc/
3.8-ARG ID=901
3.9+ADD etc/skel/* /etc/skel/
3.10+ARG ID=908
3.11 ARG WORKER=worker
3.12-RUN adduser -u ${ID} ${WORKER}
3.13+ARG WORKER_HOME=/home/${WORKER}
3.14 RUN apk add build-base zstd-dev curl make git linux-headers openssl-dev pkgconf clang m4 tree-sitter
3.15 RUN mkdir /usr/share/lisp
3.16 RUN mkdir /usr/local/share/lisp
3.17@@ -17,4 +17,10 @@
3.18 RUN make build rustup-install tree-sitter-langs-install
3.19 ENV PATH="$PATH:/usr/local/share/cargo/bin"
3.20 RUN rustup update && rustup default nightly
3.21-ADD etc/sbclrc /etc/sbclrc
3.22\ No newline at end of file
3.23+ADD etc/sbclrc /etc/sbclrc
3.24+RUN cd .. && rm -rf infra core
3.25+RUN adduser -D -u ${ID} -k /etc/skel ${WORKER}
3.26+RUN addgroup -g 512 worker -U ${WORKER}
3.27+USER ${WORKER}
3.28+WORKDIR ${WORKER_HOME}
3.29+ENTRYPOINT ["sh"]
3.30\ No newline at end of file
4.1--- a/etc/nushell/config.nu Thu Jan 25 23:21:01 2024 -0500
4.2+++ b/etc/nushell/config.nu Fri Jan 26 18:23:23 2024 -0500
4.3@@ -4,6 +4,9 @@
4.4 # https://www.nushell.sh/book/coloring_and_theming.html
4.5 # And here is the theme collection
4.6 # https://github.com/nushell/nu_scripts/tree/main/themes
4.7+
4.8+alias e = emacsclient -a=''
4.9+
4.10 def create_left_prompt [] {
4.11 mut home = ""
4.12 try {
4.13@@ -587,4 +590,4 @@
4.14 event: { send: menu name: commands_with_description }
4.15 }
4.16 ]
4.17-}
4.18\ No newline at end of file
4.19+}