changeset 33: |
48affaffc460 |
parent 32: |
99106a32c531 |
child 34: |
512cf2eba23d |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Sat, 17 Aug 2024 17:08:46 -0400 |
files: |
Containerfile.archlinux Containerfile.dev Containerfile.infra Containerfile.operator Containerfile.worker skelfile |
description: |
workers |
1.1--- a/Containerfile.archlinux Thu Aug 15 22:10:20 2024 -0400
1.2+++ b/Containerfile.archlinux Sat Aug 17 17:08:46 2024 -0400
1.3@@ -1,4 +1,5 @@
1.4 FROM archlinux:latest
1.5-RUN --network=host pacman-key --init
1.6-RUN --network=host pacman-key --populate archlinux
1.7-RUN --network=host pacman -Syu base-devel less uutils-coreutils openssl openssh mercurial git liburing wireguard-tools libxcb zstd --noconfirm
1.8\ No newline at end of file
1.9+RUN --network=host pacman-key --init -u
1.10+RUN --network=host pacman -Sy --needed archlinux-keyring --noconfirm && pacman -Su --noconfirm
1.11+RUN --network=host pacman -Syu base-devel less uutils-coreutils openssl openssh mercurial git liburing wireguard-tools libxcb zstd pacman-contrib --noconfirm
1.12+RUN pacman -Scc --noconfirm
1.13\ No newline at end of file
2.1--- a/Containerfile.dev Thu Aug 15 22:10:20 2024 -0400
2.2+++ b/Containerfile.dev Sat Aug 17 17:08:46 2024 -0400
2.3@@ -3,7 +3,7 @@
2.4 ARG DEV=dev
2.5 ARG DEV_HOME=/home/${DEV}
2.6 ARG DEV_ID=808
2.7-RUN mkdir -p /usr/share/lisp /usr/local/share/lisp /usr/local/share/rust
2.8+RUN mkdir -p /usr/share/lisp /usr/local/share/lisp /usr/local/share/rust /opt/store /opt/stash
2.9 RUN useradd --system -s /usr/bin/bash -u ${DEV_ID} -m ${DEV} -G wheel
2.10 RUN groupadd -g 128 engineer -U ${DEV}
2.11 RUN groupadd -g 256 operator -U ${DEV}
2.12@@ -15,6 +15,7 @@
2.13 RUN chown -R ${DEV}:engineer /usr/local/include/
2.14 RUN chown -R ${DEV}:engineer /usr/local/man/
2.15 RUN ssh-keygen -A
2.16+RUN pacman -Scc --noconfirm
2.17 USER ${DEV}
2.18 RUN mkdir -p ${DEV_HOME}/.stash/lisp
2.19 WORKDIR ${DEV_HOME}/.stash
3.1--- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2+++ b/Containerfile.infra Sat Aug 17 17:08:46 2024 -0400
3.3@@ -0,0 +1,3 @@
3.4+FROM localhost/worker:latest
3.5+WORKDIR ${WORKER_HOME}/.stash/infra
3.6+RUN skel clean && skel pull
3.7\ No newline at end of file
4.1--- a/Containerfile.operator Thu Aug 15 22:10:20 2024 -0400
4.2+++ b/Containerfile.operator Sat Aug 17 17:08:46 2024 -0400
4.3@@ -3,6 +3,7 @@
4.4 RUN usermod -l operator --move-home --home /home/operator ${DEV}
4.5 RUN echo "operator ALL=(ALL:ALL) NOPASSWD: ALL" | sudo tee /etc/sudoers.d/operator
4.6 RUN --network=host pacman -Sy aspell hunspell-en_us --noconfirm
4.7+RUN pacman -Scc --noconfirm
4.8 USER operator
4.9 WORKDIR /home/operator
4.10 RUN hg clone https://vc.compiler.company/comp/infra .stash/infra
5.1--- a/Containerfile.worker Thu Aug 15 22:10:20 2024 -0400
5.2+++ b/Containerfile.worker Sat Aug 17 17:08:46 2024 -0400
5.3@@ -2,10 +2,14 @@
5.4 ARG WORKER_ID=908
5.5 ARG WORKER=worker
5.6 ARG WORKER_HOME=/home/${WORKER}
5.7+ARG STASH=/usr/local/share/stash
5.8+ARG STORE=/usr/local/share/store
5.9 USER root
5.10 RUN useradd --system -s /usr/bin/bash -u ${WORKER_ID} -m ${WORKER} -G wheel
5.11+RUN echo "worker ALL=(ALL:ALL) NOPASSWD: ALL" | sudo tee /etc/sudoers.d/worker
5.12 RUN ssh-keygen -A
5.13-RUN chown -R ${WORKER_ID}:worker /usr/local/
5.14+RUN mkdir -pv ${STASH} ${STORE}
5.15+RUN chown -R ${WORKER_ID}:worker /usr/local/*
5.16 USER ${WORKER}
5.17 RUN mkdir -pv ${WORKER_HOME}/.stash
5.18 WORKDIR ${WORKER_HOME}/.stash
5.19@@ -23,4 +27,6 @@
5.20 RUN homer install
5.21 ENV WORKER=${WORKER}
5.22 ENV WORKER_ID=${WORKER_ID}
5.23-ENV WORKER_HOME=${WORKER_HOME}
5.24\ No newline at end of file
5.25+ENV WORKER_HOME=${WORKER_HOME}
5.26+ENV STASH=${STASH}
5.27+ENV STORE=${STORE}
5.28\ No newline at end of file
6.1--- a/skelfile Thu Aug 15 22:10:20 2024 -0400
6.2+++ b/skelfile Sat Aug 17 17:08:46 2024 -0400
6.3@@ -17,6 +17,12 @@
6.4 ((web () #$podman run --name web --replace -dt -p 8080:8080 -p 2020:2020 \
6.5 --volume /srv/http:/home/web/www \
6.6 web$#)
6.7+ (infra-sbcl () #$podman run --replace -dt -v /opt/stash:/usr/local/share/stash:z --name infra-sbcl infra \
6.8+ -c "skel build sbcl && skel dist sbcl && sudo cp .stash/sbcl.tar.zst /usr/local/share/stash"$#)
6.9+ (infra-emacs () #$podman run --replace -dt -v /opt/stash:/usr/local/share/stash:z --name infra-emacs infra \
6.10+ -c "skel build emacs && skel dist emacs && sudo cp .stash/emacs.tar.zst /usr/local/share/stash"$#)
6.11+ (infra-rocksdb () #$podman run --replace -dt -v /opt/stash:/usr/local/share/stash:z --name infra-rocksdb infra \
6.12+ -c "skel build rocksdb && skel dist rocksdb && sudo cp .stash/rocksdb.tar.zst /usr/local/share/stash"$#)
6.13 (operator () #$podman run --name operator --replace -dt operator$#)
6.14 (vc () #$podman run --name vc --replace -dt -p 8888:8888 vc$#)
6.15 (dev () #$podman run --name dev --replace -dt dev$#)