changeset 7: |
748865b8b90b |
parent 6: |
6444650c52f2 |
child 8: |
01a6a7befc6e |
author: |
Richard Westhaver <ellis@rwest.io> |
date: |
Sun, 16 Jun 2024 20:27:25 -0400 |
files: |
Containerfile.box Containerfile.vc Containerfile.vc-runner |
description: |
rm vc-runner, updated vc and box |
1.1--- a/Containerfile.box Sun Jun 16 20:07:11 2024 -0400
1.2+++ b/Containerfile.box Sun Jun 16 20:27:25 2024 -0400
1.3@@ -33,8 +33,8 @@
1.4 RUN chown -R ${DEV}:engineer /usr/local/man/
1.5 USER ${DEV}
1.6 RUN mkdir ${DEV_HOME}/.stash
1.7+RUN skel make quicklisp
1.8 RUN skel make clean
1.9-RUN skel make quicklisp
1.10 WORKDIR ${DEV_HOME}
1.11 ENV DEV=${DEV}
1.12 ENV DEV_ID=${ID}
1.13\ No newline at end of file
2.1--- a/Containerfile.vc Sun Jun 16 20:07:11 2024 -0400
2.2+++ b/Containerfile.vc Sun Jun 16 20:27:25 2024 -0400
2.3@@ -1,4 +1,10 @@
2.4-FROM octobus/heptapod:latest
2.5-RUN gitlab-ctl upgrade
2.6-# TODO: configure instance here, pull from comp/etc
2.7-# COPY etc/gitlab/gitlab.rb /etc/gitlab/gitlab.rb
2.8\ No newline at end of file
2.9+FROM localhost/box:latest
2.10+ARG VC_USER=vc
2.11+ARG VC_HOME=/home/${VC_USER}
2.12+ARG VC_ID=842
2.13+RUN useradd --system -s /usr/bin/bash -u ${ID} -m ${DEV}
2.14+RUN infra/scripts/wg-gen-keys.sh private.key public.key
2.15+RUN mkdir ${VC_HOME}/.stash
2.16+WORKDIR ${VC_HOME}
2.17+ENV VC_USER=${VC_USER}
2.18+ENV VC_ID=${VC_ID}
2.19\ No newline at end of file
3.1--- a/Containerfile.vc-runner Sun Jun 16 20:07:11 2024 -0400
3.2+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
3.3@@ -1,8 +0,0 @@
3.4-FROM localhost/worker:latest
3.5-USER root
3.6-RUN curl -L --output /usr/local/bin/gitlab-runner https://download.heptapod.net/runner/runner/latest/binaries/heptapod-runner-linux-amd64
3.7-ARG RUNNER_TOKEN
3.8-RUN chmod +x /usr/local/bin/gitlab-runner
3.9-RUN echo ${WORKER_USER}
3.10-RUN echo ${WORKER_HOME}
3.11-RUN gitlab-runner install --user=${WORKER_USER} --working-directory=${WORKER_HOME}
3.12\ No newline at end of file