diff --git a/arch-builder/Dockerfile b/arch-builder/Dockerfile index e705098..7eb0f35 100644 --- a/arch-builder/Dockerfile +++ b/arch-builder/Dockerfile @@ -78,9 +78,12 @@ WORKDIR /home/luser FROM base AS rust RUN mkdir -p /etc/cargo -COPY config.toml /.cargo/ +COPY --chown=1000:1000 config.toml /home/luser/.cargo/config.toml +COPY --chown=1000:1000 sccache_config.toml /home/luser/.config/sccache/config RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \ rustup \ + trunk \ + sccache \ llvm \ clang @@ -90,7 +93,6 @@ RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \ protobuf USER luser WORKDIR /home/luser -RUN mkdir .cargo RUN rustup toolchain install stable-x86_64-unknown-linux-gnu --profile minimal RUN rustup target add \ x86_64-unknown-linux-musl \ @@ -101,7 +103,6 @@ RUN rustup target add \ aarch64-unknown-linux-gnu \ wasm32-unknown-unknown \ wasm32-wasip2 -RUN --mount=type=cache,target=/home/luser/.cargo/registry/,uid=1000,gid=1000 cargo install --locked trunk 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 diff --git a/arch-builder/config.toml b/arch-builder/config.toml index c3dfaab..22ee06a 100644 --- a/arch-builder/config.toml +++ b/arch-builder/config.toml @@ -20,5 +20,5 @@ codegen-units = 4 lto = true strip = true -#[build] -#rustc-wrapper = "/usr/bin/sccache" +[build] +rustc-wrapper = "/home/luser/.cargo/bin/sccache" diff --git a/arch-builder/sccache_config.toml b/arch-builder/sccache_config.toml new file mode 100644 index 0000000..7d6c029 --- /dev/null +++ b/arch-builder/sccache_config.toml @@ -0,0 +1,3 @@ +[cache.disk] +dir = "/home/luser/.cache/sccache" +size = 12884901888 # 12 GiBytes \ No newline at end of file