# HG changeset patch # User Richard Westhaver # Date 1720453039 14400 # Node ID fc83b775ec58a027bc44ce151274f6f0140d6e4d # Parent 0d1acc5d1f35acc40985607a986b20adfcc70e92 updates diff -r 0d1acc5d1f35 -r fc83b775ec58 Containerfile.alpine --- a/Containerfile.alpine Sun Jul 07 22:53:39 2024 -0400 +++ b/Containerfile.alpine Mon Jul 08 11:37:19 2024 -0400 @@ -1,3 +1,3 @@ FROM alpine:latest RUN apk update -RUN apk add --no-cache openssh mercurial wireguard-tools liburing libc6-compat coreutils +RUN apk add --no-cache openssh mercurial wireguard-tools liburing libc6-compat coreutils tar diff -r 0d1acc5d1f35 -r fc83b775ec58 Containerfile.dev --- a/Containerfile.dev Sun Jul 07 22:53:39 2024 -0400 +++ b/Containerfile.dev Mon Jul 08 11:37:19 2024 -0400 @@ -4,7 +4,7 @@ ARG DEV_HOME=/home/${DEV} ARG DEV_ID=808 RUN mkdir -p /usr/share/lisp /usr/local/share/lisp /usr/local/share/rust -RUN useradd --system -s /usr/bin/bash -u ${DEV_ID} -m ${DEV} +RUN useradd --system -s /usr/bin/bash -u ${DEV_ID} -m ${DEV} -G wheel RUN groupadd -g 128 engineer -U ${DEV} RUN groupadd -g 256 operator -U ${DEV} RUN chown -R ${DEV}:engineer /usr/local/share/ @@ -14,6 +14,7 @@ RUN chown -R ${DEV}:engineer /usr/local/lib/ RUN chown -R ${DEV}:engineer /usr/local/include/ RUN chown -R ${DEV}:engineer /usr/local/man/ +RUN ssh-keygen -A USER ${DEV} RUN mkdir ${DEV_HOME}/.stash WORKDIR /usr/local/src diff -r 0d1acc5d1f35 -r fc83b775ec58 Containerfile.operator --- a/Containerfile.operator Sun Jul 07 22:53:39 2024 -0400 +++ b/Containerfile.operator Mon Jul 08 11:37:19 2024 -0400 @@ -1,2 +1,3 @@ FROM localhost/dev:latest -RUN /usr/local/src/infra/scripts/wg-gen-keys.sh private.key public.key \ No newline at end of file +RUN hg clone https://vc.compiler.company/comp/infra +RUN infra/scripts/wg-gen-keys.sh private.key public.key \ No newline at end of file diff -r 0d1acc5d1f35 -r fc83b775ec58 Containerfile.worker --- a/Containerfile.worker Sun Jul 07 22:53:39 2024 -0400 +++ b/Containerfile.worker Mon Jul 08 11:37:19 2024 -0400 @@ -2,7 +2,7 @@ ARG WORKER_ID=908 ARG WORKER=worker ARG WORKER_HOME=/home/${WORKER} -RUN apk add build-base zstd-dev curl make git linux-headers openssl-dev pkgconf m4 mercurial llvm libgccjit-dev zlib-dev texinfo +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 RUN mkdir -pv /usr/share/lisp /usr/local/share/lisp RUN addgroup -g 128 engineer RUN addgroup -g 256 operator @@ -13,18 +13,20 @@ WORKDIR /usr/local/src RUN hg clone https://vc.compiler.company/comp/infra WORKDIR infra -ENV CARGO_HOME="/usr/local/share/cargo" -ENV RUSTUP_HOME="/usr/local/share/rustup" +# ENV CARGO_HOME="/usr/local/share/cargo" +# ENV RUSTUP_HOME="/usr/local/share/rustup" ENV PATH="$PATH:/usr/local/share/cargo/bin:/usr/local/share/lisp/bin" RUN mkdir -pv .stash/tmp -RUN ./scripts/install-emacs-mini-pack.sh x86_64-unknown-linux-musl +# RUN ./scripts/install-emacs-mini-pack.sh x86_64-unknown-linux-musl # fails byte-code validation RUN ./scripts/install-sbcl-pack.sh x86_64-unknown-linux-musl RUN ./scripts/install-rocksdb-pack.sh x86_64-unknown-linux-musl +RUN cd .stash && curl -O https://beta.quicklisp.org/quicklisp.lisp +RUN ./scripts/quicklisp-install.sh # RUN ./bootstrap.sh # WORKDIR ${WORKER_HOME} # RUN rm -rf /usr/local/src/* -USER ${WORKER} ENV WORKER=${WORKER} ENV WORKER_ID=${WORKER_ID} ENV WORKER_HOME=${WORKER_HOME} +WORKDIR ${WORKER_HOME} ENTRYPOINT ["sh"] \ No newline at end of file