changeset 27: |
058ae6eb8c06 |
parent 26: |
29aa38f88ee6 |
child 28: |
b5ff3e39b424 |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Sat, 27 Jul 2024 02:21:46 -0400 |
files: |
Containerfile.web skelfile |
description: |
added caddy container |
1.1--- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2+++ b/Containerfile.web Sat Jul 27 02:21:46 2024 -0400
1.3@@ -0,0 +1,26 @@
1.4+FROM localhost/dev:latest
1.5+ARG WEB_USER=web
1.6+ARG WEB_HOME=/home/${WEB_USER}
1.7+ARG WEB_ID=840
1.8+USER root
1.9+RUN --network=host pacman -Sy go --noconfirm
1.10+RUN useradd --system -s /usr/bin/bash -u ${WEB_ID} -m ${WEB_USER}
1.11+USER ${WEB_USER}
1.12+WORKDIR ${WEB_HOME}
1.13+RUN hg clone https://vc.compiler.company/comp/infra .stash/infra
1.14+RUN .stash/infra/scripts/wg-gen-keys.sh private.key public.key
1.15+RUN hg clone https://vc.compiler.company/comp/home .stash/home
1.16+RUN cd .stash/home && hg up ${WEB_USER} && cp .homerc ${WEB_HOME}/.homerc
1.17+RUN homer install
1.18+RUN hg clone https://vc.compiler.company/comp/org .stash/org
1.19+RUN mkdir .stash/www
1.20+USER root
1.21+WORKDIR .stash/infra
1.22+RUN skel make xcaddy
1.23+RUN skel make caddy && skel make caddy-install
1.24+RUN skel clean
1.25+USER ${WEB_USER}
1.26+WORKDIR ${WEB_HOME}
1.27+ENV WEB_USER=${WEB_USER}
1.28+ENV WEB_ID=${WEB_ID}
1.29+ENTRYPOINT ["caddy"]
1.30\ No newline at end of file
2.1--- a/skelfile Thu Jul 25 21:46:03 2024 -0400
2.2+++ b/skelfile Sat Jul 27 02:21:46 2024 -0400
2.3@@ -3,13 +3,6 @@
2.4 :author "Richard Westhaver"
2.5 :version "0.1.0"
2.6 :vc (:hg "https://vc.compiler.company/comp/pod")
2.7-:rules
2.8-((all ())
2.9- (archlinux () #$podman build -f Containerfile.archlinux$#)
2.10- (alpine () #$podman build -f Containerfile.alpine$#)
2.11- (alpine-infra () #$podman build -f Containerfile.alpine-infra$#)
2.12- (dev () #$podman build -f Containerfile.dev$#)
2.13- (operator () #$podman build -f Containerfile.operator$#))
2.14 :components
2.15 ((:containerfile "scratch")
2.16 (:containerfile "alpine")
2.17@@ -18,4 +11,5 @@
2.18 (:containerfile "ubuntu")
2.19 (:containerfile "dev")
2.20 (:containerfile "operator")
2.21- (:containerfile "worker"))
2.22+ (:containerfile "worker")
2.23+ (:containerfile "web"))