# HG changeset patch # User Richard Westhaver # Date 1722061306 14400 # Node ID 058ae6eb8c06f5190e7bb1b6dfe1ae597c0386b8 # Parent 29aa38f88ee6cf4efe2d4c993e09a83ed3569929 added caddy container diff -r 29aa38f88ee6 -r 058ae6eb8c06 Containerfile.web --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Containerfile.web Sat Jul 27 02:21:46 2024 -0400 @@ -0,0 +1,26 @@ +FROM localhost/dev:latest +ARG WEB_USER=web +ARG WEB_HOME=/home/${WEB_USER} +ARG WEB_ID=840 +USER root +RUN --network=host pacman -Sy go --noconfirm +RUN useradd --system -s /usr/bin/bash -u ${WEB_ID} -m ${WEB_USER} +USER ${WEB_USER} +WORKDIR ${WEB_HOME} +RUN hg clone https://vc.compiler.company/comp/infra .stash/infra +RUN .stash/infra/scripts/wg-gen-keys.sh private.key public.key +RUN hg clone https://vc.compiler.company/comp/home .stash/home +RUN cd .stash/home && hg up ${WEB_USER} && cp .homerc ${WEB_HOME}/.homerc +RUN homer install +RUN hg clone https://vc.compiler.company/comp/org .stash/org +RUN mkdir .stash/www +USER root +WORKDIR .stash/infra +RUN skel make xcaddy +RUN skel make caddy && skel make caddy-install +RUN skel clean +USER ${WEB_USER} +WORKDIR ${WEB_HOME} +ENV WEB_USER=${WEB_USER} +ENV WEB_ID=${WEB_ID} +ENTRYPOINT ["caddy"] \ No newline at end of file diff -r 29aa38f88ee6 -r 058ae6eb8c06 skelfile --- a/skelfile Thu Jul 25 21:46:03 2024 -0400 +++ b/skelfile Sat Jul 27 02:21:46 2024 -0400 @@ -3,13 +3,6 @@ :author "Richard Westhaver" :version "0.1.0" :vc (:hg "https://vc.compiler.company/comp/pod") -:rules -((all ()) - (archlinux () #$podman build -f Containerfile.archlinux$#) - (alpine () #$podman build -f Containerfile.alpine$#) - (alpine-infra () #$podman build -f Containerfile.alpine-infra$#) - (dev () #$podman build -f Containerfile.dev$#) - (operator () #$podman build -f Containerfile.operator$#)) :components ((:containerfile "scratch") (:containerfile "alpine") @@ -18,4 +11,5 @@ (:containerfile "ubuntu") (:containerfile "dev") (:containerfile "operator") - (:containerfile "worker")) + (:containerfile "worker") + (:containerfile "web"))