changeset 37: |
60461d073737 |
parent 36: |
8a7410b6d45c |
child 39: |
c0ed453c44f9 |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Fri, 06 Sep 2024 20:04:25 -0400 |
files: |
Containerfile.alpine-infra Containerfile.dev Containerfile.mail Containerfile.worker skelfile |
description: |
fixes |
1.1--- a/Containerfile.alpine-infra Wed Sep 04 16:57:00 2024 -0400
1.2+++ b/Containerfile.alpine-infra Fri Sep 06 20:04:25 2024 -0400
1.3@@ -1,6 +1,6 @@
1.4 FROM localhost/alpine:latest
1.5 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
1.6-RUN hg clone https://vc.compiler.company/comp/infra
1.7+RUN hg clone https://vc.compiler.company/infra
1.8 WORKDIR infra
1.9 RUN ./check.sh
1.10 RUN mkdir -pv .stash/src .stash/tmp
2.1--- a/Containerfile.dev Wed Sep 04 16:57:00 2024 -0400
2.2+++ b/Containerfile.dev Fri Sep 06 20:04:25 2024 -0400
2.3@@ -19,7 +19,7 @@
2.4 USER ${DEV}
2.5 RUN mkdir -p ${DEV_HOME}/.stash/lisp
2.6 WORKDIR ${DEV_HOME}/.stash
2.7-RUN hg clone https://vc.compiler.company/comp/infra
2.8+RUN hg clone https://vc.compiler.company/infra
2.9 WORKDIR infra
2.10 ENV CARGO_HOME="/usr/local/share/rust/cargo"
2.11 ENV RUSTUP_HOME="/usr/local/share/rust/rustup"
2.12@@ -38,7 +38,7 @@
2.13 RUN rustup component add --toolchain nightly rust-src rust-analyzer rustc-dev llvm-tools-preview
2.14 WORKDIR ${DEV_HOME}
2.15 RUN rm -rf ${DEV_HOME}/.stash/*
2.16-RUN hg clone https://vc.compiler.company/comp/home .stash/home && cd .stash/home && hg up ${DEV}
2.17+RUN hg clone https://vc.compiler.company/home .stash/home && cd .stash/home && hg up ${DEV}
2.18 RUN cp .stash/home/.homerc ${DEV_HOME}/.homerc
2.19 RUN homer install
2.20 ENV DEV=${DEV}
3.1--- a/Containerfile.mail Wed Sep 04 16:57:00 2024 -0400
3.2+++ b/Containerfile.mail Fri Sep 06 20:04:25 2024 -0400
3.3@@ -1,1 +1,3 @@
3.4-FROM stalwartlabs/mail-server:latest
3.5\ No newline at end of file
3.6+FROM localhost/worker:latest
3.7+RUN --network=host curl --proto '=https' --tlsv1.2 -sSf https://get.stalw.art/install.sh -o .stash/install.sh
3.8+ENTRYPOINT ["sudo", ".stash/install.sh"]
3.9\ No newline at end of file
4.1--- a/Containerfile.worker Wed Sep 04 16:57:00 2024 -0400
4.2+++ b/Containerfile.worker Fri Sep 06 20:04:25 2024 -0400
4.3@@ -13,7 +13,7 @@
4.4 USER ${WORKER}
4.5 RUN mkdir -pv ${WORKER_HOME}/.stash
4.6 WORKDIR ${WORKER_HOME}/.stash
4.7-RUN hg clone https://vc.compiler.company/comp/infra
4.8+RUN hg clone https://vc.compiler.company/infra
4.9 WORKDIR infra
4.10 ENV CARGO_HOME="/usr/local/share/rust/cargo"
4.11 ENV RUSTUP_HOME="/usr/local/share/rust/rustup"
4.12@@ -22,7 +22,7 @@
4.13 RUN skel install quicklisp
4.14 RUN skel clean
4.15 WORKDIR ${WORKER_HOME}
4.16-RUN hg clone https://vc.compiler.company/comp/home .stash/home && cd .stash/home && hg up ${WORKER}
4.17+RUN hg clone https://vc.compiler.company/home .stash/home && cd .stash/home && hg up ${WORKER}
4.18 RUN cp .stash/home/.homerc ${WORKER_HOME}/.homerc
4.19 RUN homer install
4.20 ENV WORKER=${WORKER}
5.1--- a/skelfile Wed Sep 04 16:57:00 2024 -0400
5.2+++ b/skelfile Fri Sep 06 20:04:25 2024 -0400
5.3@@ -55,7 +55,7 @@
5.4 )
5.5 (mail ()
5.6 (:build () #$podman build -f Containerfile.mail -t mail --no-cache$#)
5.7- (:run () #$podman run --name mail --replace -dt mail$#))
5.8+ (:run () #$podman run --name mail --replace -dt -p 8080 mail$#))
5.9 (alpine-infra ()
5.10 (:build () #$podman build -f Containerfile.alpine-infra -t alpine-infra --replace$#)
5.11 (:run () #$podman run --name alpine-infra --replace -dt alpine-infra$#))