From f301d83c8051bf926988cc96f27a9b3017948ada Mon Sep 17 00:00:00 2001 From: Kate Goldenring Date: Wed, 2 Oct 2024 12:13:57 -0700 Subject: [PATCH] Remove reference to cross images Signed-off-by: Kate Goldenring --- Cross.toml | 11 +---------- build/containers/Dockerfile.rust | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/Cross.toml b/Cross.toml index 8adc2fa45..9db2e1525 100644 --- a/Cross.toml +++ b/Cross.toml @@ -3,13 +3,4 @@ passthrough = [ "PKG_CONFIG_ALLOW_CROSS", "RUST_LOG", "CARGO_INCREMENTAL", -] - -[target.x86_64-unknown-linux-gnu] -image = "ghcr.io/project-akri/akri/rust-crossbuild:x86_64-unknown-linux-gnu-0.1.16-0.0.7" - -[target.armv7-unknown-linux-gnueabihf] -image = "ghcr.io/project-akri/akri/rust-crossbuild:armv7-unknown-linux-gnueabihf-0.1.16-0.0.7" - -[target.aarch64-unknown-linux-gnu] -image = "ghcr.io/project-akri/akri/rust-crossbuild:aarch64-unknown-linux-gnu-0.1.16-0.0.7" \ No newline at end of file +] \ No newline at end of file diff --git a/build/containers/Dockerfile.rust b/build/containers/Dockerfile.rust index 40d742278..0a021bbd1 100644 --- a/build/containers/Dockerfile.rust +++ b/build/containers/Dockerfile.rust @@ -1,6 +1,6 @@ FROM --platform=$BUILDPLATFORM tonistiigi/xx:master AS xx -FROM --platform=$BUILDPLATFORM rust:1.74-slim-bookworm AS build +FROM --platform=$BUILDPLATFORM rust:1.79-slim-bookworm AS build RUN rustup component add rustfmt RUN apt-get update && apt-get install -y clang lld protobuf-compiler pkg-config mmdebstrap wget COPY --from=xx / /