From 1f619a9fe5a8e896ed821b21a125bb59506dd81b Mon Sep 17 00:00:00 2001 From: Jonson Petard <41122242+greenhat616@users.noreply.github.com> Date: Sat, 16 Sep 2023 16:57:48 +0800 Subject: [PATCH] fix(docker): toolchain issue --- manifest/docker/builder/aarch64-unknown-linux-musl/Dockerfile | 3 ++- manifest/docker/builder/x86_64-unknown-linux-musl/Dockerfile | 3 ++- manifest/docker/release/aarch64-linux-musl/Dockerfile | 3 ++- manifest/docker/release/x86_64-linux-musl/Dockerfile | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/manifest/docker/builder/aarch64-unknown-linux-musl/Dockerfile b/manifest/docker/builder/aarch64-unknown-linux-musl/Dockerfile index 02c5bd9..e3bc495 100644 --- a/manifest/docker/builder/aarch64-unknown-linux-musl/Dockerfile +++ b/manifest/docker/builder/aarch64-unknown-linux-musl/Dockerfile @@ -1,4 +1,5 @@ FROM messense/rust-musl-cross:aarch64-musl -RUN rustup toolchain install nightly-x86_64-unknown-linux-musl --profile minimal -t aarch64-unknown-linux-musl +RUN rustup update nightly \ + rustup target add --toolchain nightly aarch64-unknown-linux-musl CMD ["/bin/bash"] WORKDIR /home/rust/src \ No newline at end of file diff --git a/manifest/docker/builder/x86_64-unknown-linux-musl/Dockerfile b/manifest/docker/builder/x86_64-unknown-linux-musl/Dockerfile index 1f0d2e6..011e80e 100644 --- a/manifest/docker/builder/x86_64-unknown-linux-musl/Dockerfile +++ b/manifest/docker/builder/x86_64-unknown-linux-musl/Dockerfile @@ -1,4 +1,5 @@ FROM messense/rust-musl-cross:x86_64-musl -RUN rustup toolchain install nightly-x86_64-unknown-linux-musl --profile minimal -t x86_64-unknown-linux-musl +RUN rustup update nightly \ + rustup target add --toolchain nightly x86_64-unknown-linux-musl CMD ["/bin/bash"] WORKDIR /home/rust/src \ No newline at end of file diff --git a/manifest/docker/release/aarch64-linux-musl/Dockerfile b/manifest/docker/release/aarch64-linux-musl/Dockerfile index 7a9f966..4916a23 100644 --- a/manifest/docker/release/aarch64-linux-musl/Dockerfile +++ b/manifest/docker/release/aarch64-linux-musl/Dockerfile @@ -1,5 +1,6 @@ FROM messense/rust-musl-cross:aarch64-musl as builder -RUN rustup toolchain install nightly-x86_64-unknown-linux-musl --profile minimal -t aarch64-unknown-linux-musl +RUN rustup update nightly \ + rustup target add --toolchain nightly aarch64-unknown-linux-musl WORKDIR /app COPY . . RUN cargo +nightly build --release --target aarch64-unknown-linux-musl diff --git a/manifest/docker/release/x86_64-linux-musl/Dockerfile b/manifest/docker/release/x86_64-linux-musl/Dockerfile index a3fe5c4..0b0e2c9 100644 --- a/manifest/docker/release/x86_64-linux-musl/Dockerfile +++ b/manifest/docker/release/x86_64-linux-musl/Dockerfile @@ -1,5 +1,6 @@ FROM messense/rust-musl-cross:x86_64-musl as builder -RUN rustup toolchain install nightly-x86_64-unknown-linux-musl --profile minimal -t x86_64-unknown-linux-musl +RUN rustup update nightly \ + rustup target add --toolchain nightly x86_64-unknown-linux-musl WORKDIR /app COPY . . RUN cargo +nightly build --release --target x86_64-unknown-linux-musl