Switch to Buildah for container builds #51
2 changed files with 8 additions and 8 deletions
Fix launchd templates to use full docker path
launchd agents don't have /usr/local/bin in PATH by default. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
commit
911913bb2e
|
|
@ -11,17 +11,17 @@
|
|||
<string>-c</string>
|
||||
<string><![CDATA[
|
||||
# Stop and remove existing container if present
|
||||
docker stop {{ forgejo_runner_container_name }} 2>/dev/null || true
|
||||
docker rm {{ forgejo_runner_container_name }} 2>/dev/null || true
|
||||
/usr/local/bin/docker stop {{ forgejo_runner_container_name }} 2>/dev/null || true
|
||||
/usr/local/bin/docker rm {{ forgejo_runner_container_name }} 2>/dev/null || true
|
||||
|
||||
# Run the forgejo-runner daemon in a container
|
||||
# - On tailnet-jobs network (can reach Forgejo via Tailscale gateway)
|
||||
# - Mounts docker socket to spawn job containers
|
||||
# - Mounts /usr/local/bin/docker socket to spawn job containers
|
||||
# - Mounts config and data directories
|
||||
exec docker run --rm \
|
||||
exec /usr/local/bin/docker run --rm \
|
||||
--name {{ forgejo_runner_container_name }} \
|
||||
--network {{ forgejo_runner_network }} \
|
||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||
-v /var/run//usr/local/bin/docker.sock:/var/run//usr/local/bin/docker.sock \
|
||||
-v {{ forgejo_runner_config_dir }}/config.yaml:/config.yaml:ro \
|
||||
-v {{ forgejo_runner_data_dir }}:/data \
|
||||
{{ forgejo_runner_image }} \
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
<string>-c</string>
|
||||
<string><![CDATA[
|
||||
# Stop and remove existing container if present
|
||||
docker stop {{ tailscale_ci_gateway_container_name }} 2>/dev/null || true
|
||||
docker rm {{ tailscale_ci_gateway_container_name }} 2>/dev/null || true
|
||||
/usr/local/bin/docker stop {{ tailscale_ci_gateway_container_name }} 2>/dev/null || true
|
||||
/usr/local/bin/docker rm {{ tailscale_ci_gateway_container_name }} 2>/dev/null || true
|
||||
|
||||
# Run the container (foreground so launchd manages lifecycle)
|
||||
exec docker run --rm \
|
||||
exec /usr/local/bin/docker run --rm \
|
||||
--name {{ tailscale_ci_gateway_container_name }} \
|
||||
--hostname {{ tailscale_ci_gateway_hostname }} \
|
||||
--network {{ tailscale_ci_gateway_network }} \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue