diff --git a/README.md b/README.md index 41075e2..3d510d6 100644 --- a/README.md +++ b/README.md @@ -203,13 +203,14 @@ act_runner register \ --instance https://git.example.com \ --token \ --name "arm64-server" \ - --labels "arm64:host,linux/arm64:host,ubuntu:docker://ubuntu:latest,alpine:docker://alpine:latest" \ + --labels "arm64:docker://ubuntu:latest,linux/arm64:docker://ubuntu:latest,alpine:docker://alpine:latest,debian:docker://debian:latest" \ --no-interactive ``` -Label format: `name:type` or `name:type:image` -- `arm64:host` — runs jobs natively on this machine -- `ubuntu:docker://ubuntu:latest` — spins a Docker container per job (requires Docker on the host) +Label format: `name:type:image` — all jobs run inside Docker containers, never directly on the host. +- `arm64:docker://ubuntu:latest` — dispatched to this runner, job runs in a native arm64 Ubuntu container +- `linux/arm64:docker://ubuntu:latest` — OCI-style label for the same runner +- Docker must be installed and running on the host machine ### 4 — Run as a systemd service diff --git a/rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh b/rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh index 76229ff..f320377 100755 --- a/rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh +++ b/rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh @@ -270,9 +270,9 @@ case "$_HOST_ARCH" in aarch64) _ARCH_LABEL="arm64" ;; *) _ARCH_LABEL="$_HOST_ARCH" ;; esac -RUNNER_LABELS="${_ARCH_LABEL}:host," -RUNNER_LABELS+="linux:host," -RUNNER_LABELS+="linux/${_ARCH_LABEL}:host," +RUNNER_LABELS="${_ARCH_LABEL}:docker://ubuntu:latest," +RUNNER_LABELS+="linux:docker://ubuntu:latest," +RUNNER_LABELS+="linux/${_ARCH_LABEL}:docker://ubuntu:latest," RUNNER_LABELS+="node14:docker://node:14," RUNNER_LABELS+="node16:docker://node:16," RUNNER_LABELS+="node18:docker://node:18,"