From 5ab7010c37c6db61d12d10efc8ad38c7266eb920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Fri, 1 Sep 2023 00:12:48 +0200 Subject: [PATCH] Fix reference to rust-toolchain.toml in Docker --- docker/Dockerfile.j2 | 2 +- docker/amd64/Dockerfile | 2 +- docker/amd64/Dockerfile.alpine | 2 +- docker/amd64/Dockerfile.buildkit | 2 +- docker/amd64/Dockerfile.buildkit.alpine | 2 +- docker/arm64/Dockerfile | 2 +- docker/arm64/Dockerfile.alpine | 2 +- docker/arm64/Dockerfile.buildkit | 2 +- docker/arm64/Dockerfile.buildkit.alpine | 2 +- docker/armv6/Dockerfile | 2 +- docker/armv6/Dockerfile.alpine | 2 +- docker/armv6/Dockerfile.buildkit | 2 +- docker/armv6/Dockerfile.buildkit.alpine | 2 +- docker/armv7/Dockerfile | 2 +- docker/armv7/Dockerfile.alpine | 2 +- docker/armv7/Dockerfile.buildkit | 2 +- docker/armv7/Dockerfile.buildkit.alpine | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docker/Dockerfile.j2 b/docker/Dockerfile.j2 index dff80a8630..04cd53181a 100644 --- a/docker/Dockerfile.j2 +++ b/docker/Dockerfile.j2 @@ -146,7 +146,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs {% if package_arch_target is defined %} diff --git a/docker/amd64/Dockerfile b/docker/amd64/Dockerfile index afe780dfe4..8a24f6e115 100644 --- a/docker/amd64/Dockerfile +++ b/docker/amd64/Dockerfile @@ -54,7 +54,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs diff --git a/docker/amd64/Dockerfile.alpine b/docker/amd64/Dockerfile.alpine index 2a2a579f34..88a94c6e28 100644 --- a/docker/amd64/Dockerfile.alpine +++ b/docker/amd64/Dockerfile.alpine @@ -51,7 +51,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs RUN rustup target add x86_64-unknown-linux-musl diff --git a/docker/amd64/Dockerfile.buildkit b/docker/amd64/Dockerfile.buildkit index d3c07b4684..6d9efe36e1 100644 --- a/docker/amd64/Dockerfile.buildkit +++ b/docker/amd64/Dockerfile.buildkit @@ -54,7 +54,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs diff --git a/docker/amd64/Dockerfile.buildkit.alpine b/docker/amd64/Dockerfile.buildkit.alpine index c15778d732..a2e309699c 100644 --- a/docker/amd64/Dockerfile.buildkit.alpine +++ b/docker/amd64/Dockerfile.buildkit.alpine @@ -51,7 +51,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry rustup target add x86_64-unknown-linux-musl diff --git a/docker/arm64/Dockerfile b/docker/arm64/Dockerfile index 589efff183..45f7d2f263 100644 --- a/docker/arm64/Dockerfile +++ b/docker/arm64/Dockerfile @@ -72,7 +72,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs RUN rustup target add aarch64-unknown-linux-gnu diff --git a/docker/arm64/Dockerfile.alpine b/docker/arm64/Dockerfile.alpine index 81967c38b0..3b200f48da 100644 --- a/docker/arm64/Dockerfile.alpine +++ b/docker/arm64/Dockerfile.alpine @@ -51,7 +51,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs RUN rustup target add aarch64-unknown-linux-musl diff --git a/docker/arm64/Dockerfile.buildkit b/docker/arm64/Dockerfile.buildkit index 9366324418..a23d60bbcb 100644 --- a/docker/arm64/Dockerfile.buildkit +++ b/docker/arm64/Dockerfile.buildkit @@ -72,7 +72,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry rustup target add aarch64-unknown-linux-gnu diff --git a/docker/arm64/Dockerfile.buildkit.alpine b/docker/arm64/Dockerfile.buildkit.alpine index 44a83a2240..a3ac39a79f 100644 --- a/docker/arm64/Dockerfile.buildkit.alpine +++ b/docker/arm64/Dockerfile.buildkit.alpine @@ -51,7 +51,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry rustup target add aarch64-unknown-linux-musl diff --git a/docker/armv6/Dockerfile b/docker/armv6/Dockerfile index 4087b295eb..bdae949e61 100644 --- a/docker/armv6/Dockerfile +++ b/docker/armv6/Dockerfile @@ -72,7 +72,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs RUN rustup target add arm-unknown-linux-gnueabi diff --git a/docker/armv6/Dockerfile.alpine b/docker/armv6/Dockerfile.alpine index 0e83eb6589..4225684adc 100644 --- a/docker/armv6/Dockerfile.alpine +++ b/docker/armv6/Dockerfile.alpine @@ -53,7 +53,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs RUN rustup target add arm-unknown-linux-musleabi diff --git a/docker/armv6/Dockerfile.buildkit b/docker/armv6/Dockerfile.buildkit index 7ca4a3ccf0..db55e7c880 100644 --- a/docker/armv6/Dockerfile.buildkit +++ b/docker/armv6/Dockerfile.buildkit @@ -72,7 +72,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry rustup target add arm-unknown-linux-gnueabi diff --git a/docker/armv6/Dockerfile.buildkit.alpine b/docker/armv6/Dockerfile.buildkit.alpine index 699489364d..d00adfac07 100644 --- a/docker/armv6/Dockerfile.buildkit.alpine +++ b/docker/armv6/Dockerfile.buildkit.alpine @@ -53,7 +53,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry rustup target add arm-unknown-linux-musleabi diff --git a/docker/armv7/Dockerfile b/docker/armv7/Dockerfile index a8f836bad0..f77fe47058 100644 --- a/docker/armv7/Dockerfile +++ b/docker/armv7/Dockerfile @@ -72,7 +72,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs RUN rustup target add armv7-unknown-linux-gnueabihf diff --git a/docker/armv7/Dockerfile.alpine b/docker/armv7/Dockerfile.alpine index 272004b845..0b51c7af4b 100644 --- a/docker/armv7/Dockerfile.alpine +++ b/docker/armv7/Dockerfile.alpine @@ -51,7 +51,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs RUN rustup target add armv7-unknown-linux-musleabihf diff --git a/docker/armv7/Dockerfile.buildkit b/docker/armv7/Dockerfile.buildkit index 64019362d1..bc8fb9b1e7 100644 --- a/docker/armv7/Dockerfile.buildkit +++ b/docker/armv7/Dockerfile.buildkit @@ -72,7 +72,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry rustup target add armv7-unknown-linux-gnueabihf diff --git a/docker/armv7/Dockerfile.buildkit.alpine b/docker/armv7/Dockerfile.buildkit.alpine index c2653e44ab..20368795d9 100644 --- a/docker/armv7/Dockerfile.buildkit.alpine +++ b/docker/armv7/Dockerfile.buildkit.alpine @@ -51,7 +51,7 @@ WORKDIR /app # Copies over *only* your manifests and build files COPY ./Cargo.* ./ -COPY ./rust-toolchain ./rust-toolchain +COPY ./rust-toolchain.toml ./rust-toolchain.toml COPY ./build.rs ./build.rs RUN --mount=type=cache,target=/root/.cargo/git --mount=type=cache,target=/root/.cargo/registry rustup target add armv7-unknown-linux-musleabihf