# HG changeset patch # User Richard Westhaver # Date 1726273073 14400 # Node ID c4d56de0ee1a895bf3fbff212612b8a6fd17d564 # Parent 8a7410b6d45cb42e3713599c2207f2b9f839eada cleanup diff -r 8a7410b6d45c -r c4d56de0ee1a Containerfile.vc --- a/Containerfile.vc Wed Sep 04 16:57:00 2024 -0400 +++ b/Containerfile.vc Fri Sep 13 20:17:53 2024 -0400 @@ -3,17 +3,17 @@ ARG VC_HOME=/home/${VC_USER} ARG VC_ID=842 USER root -RUN --network=host pacman -Sy python-pygments python-pygit2 python-dulwich python-pip apache nano --noconfirm +RUN --network=host pacman -Sy python-pygments python-pygit2 python-dulwich python-pip apache uwsgi --noconfirm RUN useradd --system -s /usr/bin/bash -u ${VC_ID} -m ${VC_USER} USER ${VC_USER} WORKDIR ${VC_HOME} RUN pip install --user --break-system-packages hg-evolve RUN mkdir .stash -RUN hg clone https://vc.compiler.company/infra .stash/infra +COPY --chmod=0755 infra .stash/infra RUN .stash/infra/scripts/wg-gen-keys.sh private.key public.key -RUN hg clone https://vc.compiler.company/home .stash/home +RUN cp -rf .stash/infra/home .stash/home RUN cd .stash/home && hg up ${VC_USER} && cp .homerc ${VC_HOME}/.homerc RUN homer install ENV VC_USER=${VC_USER} ENV VC_ID=${VC_ID} -ENTRYPOINT ["hg", "serve", "--web-conf", "hgweb.conf"] \ No newline at end of file +CMD ["./serve.sh"] \ No newline at end of file diff -r 8a7410b6d45c -r c4d56de0ee1a skelfile --- a/skelfile Wed Sep 04 16:57:00 2024 -0400 +++ b/skelfile Fri Sep 13 20:17:53 2024 -0400 @@ -46,6 +46,9 @@ (vc () (:build () #$podman build -f Containerfile.vc -t vc --no-cache$#) (:run () #$podman run --name vc --replace -dt -v $HOME/src:/home/vc/src:z -p 8888:8888 vc$#)) + ;; (git () + ;; (:build () #$podman build -f Containerfile.git -t git --no-cache$#) + ;; (:run () #$podman run --name git --replace -dt -v $HOME/src/packy:/home/vc/packy:z -p 8889:80 git$#)) (dev () (:build () #$podman build -f Containerfile.dev -t dev --no-cache$#) (:run () #$podman run --name dev --replace -dt dev$#))