# HG changeset patch # User Richard Westhaver # Date 1718584045 14400 # Node ID 748865b8b90b31eabb0fc19f404683cf5505d272 # Parent 6444650c52f211ee2b6eb1fdec5f12c74c1884e0 rm vc-runner, updated vc and box diff -r 6444650c52f2 -r 748865b8b90b Containerfile.box --- a/Containerfile.box Sun Jun 16 20:07:11 2024 -0400 +++ b/Containerfile.box Sun Jun 16 20:27:25 2024 -0400 @@ -33,8 +33,8 @@ RUN chown -R ${DEV}:engineer /usr/local/man/ USER ${DEV} RUN mkdir ${DEV_HOME}/.stash +RUN skel make quicklisp RUN skel make clean -RUN skel make quicklisp WORKDIR ${DEV_HOME} ENV DEV=${DEV} ENV DEV_ID=${ID} \ No newline at end of file diff -r 6444650c52f2 -r 748865b8b90b Containerfile.vc --- a/Containerfile.vc Sun Jun 16 20:07:11 2024 -0400 +++ b/Containerfile.vc Sun Jun 16 20:27:25 2024 -0400 @@ -1,4 +1,10 @@ -FROM octobus/heptapod:latest -RUN gitlab-ctl upgrade -# TODO: configure instance here, pull from comp/etc -# COPY etc/gitlab/gitlab.rb /etc/gitlab/gitlab.rb \ No newline at end of file +FROM localhost/box:latest +ARG VC_USER=vc +ARG VC_HOME=/home/${VC_USER} +ARG VC_ID=842 +RUN useradd --system -s /usr/bin/bash -u ${ID} -m ${DEV} +RUN infra/scripts/wg-gen-keys.sh private.key public.key +RUN mkdir ${VC_HOME}/.stash +WORKDIR ${VC_HOME} +ENV VC_USER=${VC_USER} +ENV VC_ID=${VC_ID} \ No newline at end of file diff -r 6444650c52f2 -r 748865b8b90b Containerfile.vc-runner --- a/Containerfile.vc-runner Sun Jun 16 20:07:11 2024 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -FROM localhost/worker:latest -USER root -RUN curl -L --output /usr/local/bin/gitlab-runner https://download.heptapod.net/runner/runner/latest/binaries/heptapod-runner-linux-amd64 -ARG RUNNER_TOKEN -RUN chmod +x /usr/local/bin/gitlab-runner -RUN echo ${WORKER_USER} -RUN echo ${WORKER_HOME} -RUN gitlab-runner install --user=${WORKER_USER} --working-directory=${WORKER_HOME} \ No newline at end of file