# HG changeset patch # User Richard Westhaver # Date 1720407219 14400 # Node ID 0d1acc5d1f35acc40985607a986b20adfcc70e92 # Parent 576882e9345a88def9a8fe890a575f97e8c53be1 install/dist updates diff -r 576882e9345a -r 0d1acc5d1f35 Containerfile.alpine-infra --- a/Containerfile.alpine-infra Sun Jul 07 21:27:55 2024 -0400 +++ b/Containerfile.alpine-infra Sun Jul 07 22:53:39 2024 -0400 @@ -1,11 +1,11 @@ FROM localhost/alpine:latest -RUN apk add --no-cache build-base zstd-dev sbcl git make linux-headers pkgconf m4 perl autoconf texinfo ncurses-dev libgccjit-dev zlib-dev +RUN apk add --no-cache build-base zstd-dev sbcl git make linux-headers pkgconf m4 perl autoconf texinfo ncurses-dev libgccjit-dev zlib-dev tar RUN hg clone https://vc.compiler.company/comp/infra WORKDIR infra RUN ./check.sh RUN mkdir -pv .stash/src # RUN ./scripts/get-sbcl.sh && cd .stash/src/sbcl && echo \""2.4.6:$(git rev-parse --short HEAD)"\" > version.lisp-expr && ./make.sh --dynamic-space-size=8Gb --fancy && sh make-shared-library.sh && INSTALL_ROOT=/usr/local sh install.sh # RUN ./scripts/get-rocksdb.sh && cd .stash/src/rocksdb && make shared_lib DISABLE_JEMALLOC=1 && make install-shared && cp -r include/* /usr/local/include/ -# RUN ./scripts/dist-sbcl-binary.sh +# RUN ./scripts/dist-sbcl-binary.sh # RUN ./scripts/dist-rocksdb-binary.sh -# RUN ./scripts/quicklisp-install.sh +# RUN ./scripts/quicklisp-install.sh diff -r 576882e9345a -r 0d1acc5d1f35 Containerfile.worker --- a/Containerfile.worker Sun Jul 07 21:27:55 2024 -0400 +++ b/Containerfile.worker Sun Jul 07 22:53:39 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 +RUN apk add build-base zstd-dev curl make git linux-headers openssl-dev pkgconf m4 mercurial llvm libgccjit-dev zlib-dev texinfo RUN mkdir -pv /usr/share/lisp /usr/local/share/lisp RUN addgroup -g 128 engineer RUN addgroup -g 256 operator @@ -16,6 +16,10 @@ 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-sbcl-pack.sh x86_64-unknown-linux-musl +RUN ./scripts/install-rocksdb-pack.sh x86_64-unknown-linux-musl # RUN ./bootstrap.sh # WORKDIR ${WORKER_HOME} # RUN rm -rf /usr/local/src/*