diff --git a/.gitea/workflows/build-arch-builder.yaml b/.gitea/workflows/build-arch-builder.yaml index eb428b0..02d5a32 100644 --- a/.gitea/workflows/build-arch-builder.yaml +++ b/.gitea/workflows/build-arch-builder.yaml @@ -101,7 +101,7 @@ jobs: "gitea.woggioni.net/woggioni/arch-builder:rust-full-sccache" target: rust-full-sccache - - name: Build and push arch-builder gitea_act_runner images + name: Build and push arch-builder gitea-runner images uses: docker/build-push-action@v6 with: builder: multiplatform-builder @@ -110,5 +110,5 @@ jobs: push: true pull: true tags: | - "gitea.woggioni.net/woggioni/arch-builder:gitea_act_runner" - target: gitea_act_runner + "gitea.woggioni.net/woggioni/arch-builder:gitea-runner" + target: gitea-runner diff --git a/arch-builder/Dockerfile b/arch-builder/Dockerfile index 5af47db..d8e9e87 100644 --- a/arch-builder/Dockerfile +++ b/arch-builder/Dockerfile @@ -141,10 +141,10 @@ RUN rustup target add \ wasm32-unknown-unknown \ wasm32-wasip2 -FROM base AS gitea_act_runner +FROM base AS gitea-runner RUN --mount=type=bind,source=woggioni.net.ca.pem,target=/root.pem trust anchor root.pem RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed nodejs npm docker docker-buildx btrfs-progs hidapi protobuf rustup llvm clang trunk emscripten sccache -RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed gitea-act-runner jdk21-graalvm-bin jdk25-graalvm-bin jdk21-graalvm-ce-bin jdk25-graalvm-ce-bin go +RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed gitea-runner jdk21-graalvm-bin jdk25-graalvm-bin jdk21-graalvm-ce-bin jdk25-graalvm-ce-bin go RUN usermod -a luser -G docker USER luser WORKDIR /home/luser @@ -167,4 +167,4 @@ RUN cargo install worker-build RUN cargo install wasm-bindgen-cli RUN npm install -D wrangler ENV PATH="/home/luser/.local/bin:/home/luser/.cargo/bin:${PATH}" -CMD ["/usr/lib/gitea/act_runner/act_runner", "daemon", "--config", "/var/lib/gitea/act_runner.yaml"] +CMD ["/usr/lib/gitea/bin/runner", "daemon", "--config", "/var/lib/gitea/runner.yaml"]