changeset 19: |
fc83b775ec58 |
parent 18: |
0d1acc5d1f35 |
child 20: |
0d8ab72c4c32 |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Mon, 08 Jul 2024 11:37:19 -0400 |
files: |
Containerfile.alpine Containerfile.dev Containerfile.operator Containerfile.worker |
description: |
updates |
1.1--- a/Containerfile.alpine Sun Jul 07 22:53:39 2024 -0400
1.2+++ b/Containerfile.alpine Mon Jul 08 11:37:19 2024 -0400
1.3@@ -1,3 +1,3 @@
1.4 FROM alpine:latest
1.5 RUN apk update
1.6-RUN apk add --no-cache openssh mercurial wireguard-tools liburing libc6-compat coreutils
1.7+RUN apk add --no-cache openssh mercurial wireguard-tools liburing libc6-compat coreutils tar
2.1--- a/Containerfile.dev Sun Jul 07 22:53:39 2024 -0400
2.2+++ b/Containerfile.dev Mon Jul 08 11:37:19 2024 -0400
2.3@@ -4,7 +4,7 @@
2.4 ARG DEV_HOME=/home/${DEV}
2.5 ARG DEV_ID=808
2.6 RUN mkdir -p /usr/share/lisp /usr/local/share/lisp /usr/local/share/rust
2.7-RUN useradd --system -s /usr/bin/bash -u ${DEV_ID} -m ${DEV}
2.8+RUN useradd --system -s /usr/bin/bash -u ${DEV_ID} -m ${DEV} -G wheel
2.9 RUN groupadd -g 128 engineer -U ${DEV}
2.10 RUN groupadd -g 256 operator -U ${DEV}
2.11 RUN chown -R ${DEV}:engineer /usr/local/share/
2.12@@ -14,6 +14,7 @@
2.13 RUN chown -R ${DEV}:engineer /usr/local/lib/
2.14 RUN chown -R ${DEV}:engineer /usr/local/include/
2.15 RUN chown -R ${DEV}:engineer /usr/local/man/
2.16+RUN ssh-keygen -A
2.17 USER ${DEV}
2.18 RUN mkdir ${DEV_HOME}/.stash
2.19 WORKDIR /usr/local/src
3.1--- a/Containerfile.operator Sun Jul 07 22:53:39 2024 -0400
3.2+++ b/Containerfile.operator Mon Jul 08 11:37:19 2024 -0400
3.3@@ -1,2 +1,3 @@
3.4 FROM localhost/dev:latest
3.5-RUN /usr/local/src/infra/scripts/wg-gen-keys.sh private.key public.key
3.6\ No newline at end of file
3.7+RUN hg clone https://vc.compiler.company/comp/infra
3.8+RUN infra/scripts/wg-gen-keys.sh private.key public.key
3.9\ No newline at end of file
4.1--- a/Containerfile.worker Sun Jul 07 22:53:39 2024 -0400
4.2+++ b/Containerfile.worker Mon Jul 08 11:37:19 2024 -0400
4.3@@ -2,7 +2,7 @@
4.4 ARG WORKER_ID=908
4.5 ARG WORKER=worker
4.6 ARG WORKER_HOME=/home/${WORKER}
4.7-RUN apk add build-base zstd-dev curl make git linux-headers openssl-dev pkgconf m4 mercurial llvm libgccjit-dev zlib-dev texinfo
4.8+RUN apk add build-base zstd-dev curl make git linux-headers openssl-dev pkgconf m4 mercurial llvm libgccjit-dev zlib-dev texinfo gnutls-dev ncurses-dev
4.9 RUN mkdir -pv /usr/share/lisp /usr/local/share/lisp
4.10 RUN addgroup -g 128 engineer
4.11 RUN addgroup -g 256 operator
4.12@@ -13,18 +13,20 @@
4.13 WORKDIR /usr/local/src
4.14 RUN hg clone https://vc.compiler.company/comp/infra
4.15 WORKDIR infra
4.16-ENV CARGO_HOME="/usr/local/share/cargo"
4.17-ENV RUSTUP_HOME="/usr/local/share/rustup"
4.18+# ENV CARGO_HOME="/usr/local/share/cargo"
4.19+# ENV RUSTUP_HOME="/usr/local/share/rustup"
4.20 ENV PATH="$PATH:/usr/local/share/cargo/bin:/usr/local/share/lisp/bin"
4.21 RUN mkdir -pv .stash/tmp
4.22-RUN ./scripts/install-emacs-mini-pack.sh x86_64-unknown-linux-musl
4.23+# RUN ./scripts/install-emacs-mini-pack.sh x86_64-unknown-linux-musl # fails byte-code validation
4.24 RUN ./scripts/install-sbcl-pack.sh x86_64-unknown-linux-musl
4.25 RUN ./scripts/install-rocksdb-pack.sh x86_64-unknown-linux-musl
4.26+RUN cd .stash && curl -O https://beta.quicklisp.org/quicklisp.lisp
4.27+RUN ./scripts/quicklisp-install.sh
4.28 # RUN ./bootstrap.sh
4.29 # WORKDIR ${WORKER_HOME}
4.30 # RUN rm -rf /usr/local/src/*
4.31-USER ${WORKER}
4.32 ENV WORKER=${WORKER}
4.33 ENV WORKER_ID=${WORKER_ID}
4.34 ENV WORKER_HOME=${WORKER_HOME}
4.35+WORKDIR ${WORKER_HOME}
4.36 ENTRYPOINT ["sh"]
4.37\ No newline at end of file