Fix rust toolchain for alpine

Author: socheatsok78

alpine/Dockerfile

@@ -4,10 +4,11 @@ ARG NGINX_VERSION=stable
 
 FROM nginx:${NGINX_VERSION}-alpine AS base-builder
 
-RUN apk update \
+RUN --mount=type=cache,id=alpine,target=/tmp/locked,sharing=locked \
+    apk update \
     && apk add linux-headers openssl-dev pcre2-dev zlib-dev openssl abuild \
                musl-dev libxslt libxml2-utils make mercurial gcc unzip git \
-               xz g++ coreutils curl \
+               xz g++ coreutils curl rustup \
     # allow abuild as a root user \
     && printf "#!/bin/sh\\nSETFATTR=true /usr/bin/abuild -F \"\$@\"\\n" > /usr/local/bin/abuild \
     && chmod +x /usr/local/bin/abuild
@@ -16,10 +17,10 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
     RUST_VERSION=1.86.0
-COPY --from=rustup-init /rustup-init /usr/local/bin/rustup-init
+# COPY --from=rustup-init /rustup-init /usr/bin/rustup-init
 RUN --mount=type=cache,id=alpine,target=/tmp/locked,sharing=locked \
     set -ex; \
-    /usr/local/bin/rustup-init -y --no-modify-path --profile minimal --default-toolchain ${RUST_VERSION}; \
+    /usr/bin/rustup-init -y --no-modify-path --profile minimal --default-toolchain ${RUST_VERSION}; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
     rustup --version; \
     cargo --version; \

debian/Dockerfile

@@ -4,7 +4,8 @@ ARG NGINX_VERSION=stable
 
 FROM nginx:${NGINX_VERSION} AS base-builder
 
-RUN apt-get update \
+RUN --mount=type=cache,id=alpine,target=/tmp/locked,sharing=locked \
+    apt-get update \
     && apt-get install -y --no-install-suggests --no-install-recommends \
                 patch make wget git devscripts debhelper dpkg-dev \
                 quilt lsb-release build-essential libxml2-utils xsltproc \
@@ -24,10 +25,10 @@ ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
     RUST_VERSION=1.86.0
-COPY --from=rustup-init /rustup-init /usr/local/bin/rustup-init
+COPY --from=rustup-init /rustup-init /usr/bin/rustup-init
 RUN --mount=type=cache,id=alpine,target=/tmp/locked,sharing=locked \
     set -ex; \
-    /usr/local/bin/rustup-init -y --no-modify-path --profile minimal --default-toolchain ${RUST_VERSION}; \
+    /usr/bin/rustup-init -y --no-modify-path --profile minimal --default-toolchain ${RUST_VERSION}; \
     chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
     rustup --version; \
     cargo --version; \