# HG changeset patch # User Richard Westhaver # Date 1725667465 14400 # Node ID 60461d07373771bf08b560b9ff5862c4ac04c02f # Parent 8a7410b6d45cb42e3713599c2207f2b9f839eada fixes diff -r 8a7410b6d45c -r 60461d073737 Containerfile.alpine-infra --- a/Containerfile.alpine-infra Wed Sep 04 16:57:00 2024 -0400 +++ b/Containerfile.alpine-infra Fri Sep 06 20:04:25 2024 -0400 @@ -1,6 +1,6 @@ FROM localhost/alpine:latest RUN apk add --no-cache build-base zstd-dev git make linux-headers pkgconf m4 perl autoconf texinfo ncurses-dev libgccjit-dev zlib-dev tar shared-mime-info tree-sitter-dev btrfs-progs-dev liburing-dev curl alsa-lib-dev libssh2-dev clang lld musl-dev openssh libxkbcommon-dev sbcl -RUN hg clone https://vc.compiler.company/comp/infra +RUN hg clone https://vc.compiler.company/infra WORKDIR infra RUN ./check.sh RUN mkdir -pv .stash/src .stash/tmp diff -r 8a7410b6d45c -r 60461d073737 Containerfile.dev --- a/Containerfile.dev Wed Sep 04 16:57:00 2024 -0400 +++ b/Containerfile.dev Fri Sep 06 20:04:25 2024 -0400 @@ -19,7 +19,7 @@ USER ${DEV} RUN mkdir -p ${DEV_HOME}/.stash/lisp WORKDIR ${DEV_HOME}/.stash -RUN hg clone https://vc.compiler.company/comp/infra +RUN hg clone https://vc.compiler.company/infra WORKDIR infra ENV CARGO_HOME="/usr/local/share/rust/cargo" ENV RUSTUP_HOME="/usr/local/share/rust/rustup" @@ -38,7 +38,7 @@ RUN rustup component add --toolchain nightly rust-src rust-analyzer rustc-dev llvm-tools-preview WORKDIR ${DEV_HOME} RUN rm -rf ${DEV_HOME}/.stash/* -RUN hg clone https://vc.compiler.company/comp/home .stash/home && cd .stash/home && hg up ${DEV} +RUN hg clone https://vc.compiler.company/home .stash/home && cd .stash/home && hg up ${DEV} RUN cp .stash/home/.homerc ${DEV_HOME}/.homerc RUN homer install ENV DEV=${DEV} diff -r 8a7410b6d45c -r 60461d073737 Containerfile.mail --- a/Containerfile.mail Wed Sep 04 16:57:00 2024 -0400 +++ b/Containerfile.mail Fri Sep 06 20:04:25 2024 -0400 @@ -1,1 +1,3 @@ -FROM stalwartlabs/mail-server:latest \ No newline at end of file +FROM localhost/worker:latest +RUN --network=host curl --proto '=https' --tlsv1.2 -sSf https://get.stalw.art/install.sh -o .stash/install.sh +ENTRYPOINT ["sudo", ".stash/install.sh"] \ No newline at end of file diff -r 8a7410b6d45c -r 60461d073737 Containerfile.worker --- a/Containerfile.worker Wed Sep 04 16:57:00 2024 -0400 +++ b/Containerfile.worker Fri Sep 06 20:04:25 2024 -0400 @@ -13,7 +13,7 @@ USER ${WORKER} RUN mkdir -pv ${WORKER_HOME}/.stash WORKDIR ${WORKER_HOME}/.stash -RUN hg clone https://vc.compiler.company/comp/infra +RUN hg clone https://vc.compiler.company/infra WORKDIR infra ENV CARGO_HOME="/usr/local/share/rust/cargo" ENV RUSTUP_HOME="/usr/local/share/rust/rustup" @@ -22,7 +22,7 @@ RUN skel install quicklisp RUN skel clean WORKDIR ${WORKER_HOME} -RUN hg clone https://vc.compiler.company/comp/home .stash/home && cd .stash/home && hg up ${WORKER} +RUN hg clone https://vc.compiler.company/home .stash/home && cd .stash/home && hg up ${WORKER} RUN cp .stash/home/.homerc ${WORKER_HOME}/.homerc RUN homer install ENV WORKER=${WORKER} diff -r 8a7410b6d45c -r 60461d073737 skelfile --- a/skelfile Wed Sep 04 16:57:00 2024 -0400 +++ b/skelfile Fri Sep 06 20:04:25 2024 -0400 @@ -55,7 +55,7 @@ ) (mail () (:build () #$podman build -f Containerfile.mail -t mail --no-cache$#) - (:run () #$podman run --name mail --replace -dt mail$#)) + (:run () #$podman run --name mail --replace -dt -p 8080 mail$#)) (alpine-infra () (:build () #$podman build -f Containerfile.alpine-infra -t alpine-infra --replace$#) (:run () #$podman run --name alpine-infra --replace -dt alpine-infra$#))