diff --git a/arch-builder/Dockerfile b/arch-builder/Dockerfile index 1a7a6a1..8cdb019 100644 --- a/arch-builder/Dockerfile +++ b/arch-builder/Dockerfile @@ -109,15 +109,18 @@ RUN rustup target add \ wasm32-wasip2 FROM base AS gitea_act_runner -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 -RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed gitea-act-runner jdk21-graalvm-bin jdk23-graalvm-bin jdk21-graalvm-ce-bin jdk23-graalvm-ce-bin 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 jdk23-graalvm-bin jdk21-graalvm-ce-bin jdk23-graalvm-ce-bin RUN usermod -a luser -G docker USER luser WORKDIR /home/luser +COPY --chown=1000:1000 config.toml /home/luser/.cargo/config.toml +COPY --chown=1000:1000 sccache_config.toml /home/luser/.config/sccache/config RUN rustup update RUN rustup toolchain install stable-x86_64-unknown-linux-gnu --profile minimal RUN rustup component add rustfmt +RUN rustup component add clippy RUN rustup target add \ x86_64-unknown-linux-musl \ x86_64-unknown-linux-gnu \ diff --git a/arch-builder/config.toml b/arch-builder/config.toml index 9158739..dd40c7b 100644 --- a/arch-builder/config.toml +++ b/arch-builder/config.toml @@ -19,5 +19,5 @@ opt-level = 3 lto = true strip = true -#[build] -#rustc-wrapper = "/usr/sbin/sccache" +[build] +rustc-wrapper = "/usr/bin/sccache"