From 520ab2c69bda24b3cbb68a23628aa1bd1603d566 Mon Sep 17 00:00:00 2001 From: Nicolas Belouin Date: Thu, 27 Apr 2023 13:46:26 +0200 Subject: [PATCH] Add protobuf-compiler to crossbuild intermediate containers Needed by #593 for prost upgrade Signed-off-by: Nicolas Belouin --- .../containers/intermediate/Dockerfile.rust-crossbuild-amd64 | 4 ++-- .../intermediate/Dockerfile.rust-crossbuild-arm32v7 | 2 +- .../intermediate/Dockerfile.rust-crossbuild-arm64v8 | 4 ++-- build/intermediate-containers.mk | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/containers/intermediate/Dockerfile.rust-crossbuild-amd64 b/build/containers/intermediate/Dockerfile.rust-crossbuild-amd64 index 6240cb06f..1ee0df805 100644 --- a/build/containers/intermediate/Dockerfile.rust-crossbuild-amd64 +++ b/build/containers/intermediate/Dockerfile.rust-crossbuild-amd64 @@ -14,7 +14,7 @@ FROM rustembedded/cross:x86_64-unknown-linux-gnu-0.1.16 RUN apt-get update && \ apt-get install -y --no-install-recommends pkg-config \ g++ ca-certificates curl libssl-dev \ - libv4l-dev libudev-dev + libv4l-dev libudev-dev protobuf-compiler # Link the container to the Akri repository -LABEL org.opencontainers.image.source https://github.com/project-akri/akri \ No newline at end of file +LABEL org.opencontainers.image.source https://github.com/project-akri/akri diff --git a/build/containers/intermediate/Dockerfile.rust-crossbuild-arm32v7 b/build/containers/intermediate/Dockerfile.rust-crossbuild-arm32v7 index ce0da22c1..447430d53 100644 --- a/build/containers/intermediate/Dockerfile.rust-crossbuild-arm32v7 +++ b/build/containers/intermediate/Dockerfile.rust-crossbuild-arm32v7 @@ -19,7 +19,7 @@ RUN sed -i 's/^deb h'/'deb [arch=amd64,i386] h/' /etc/apt/sources.list && \ apt-get update && \ apt-get install -y --no-install-recommends pkg-config:armhf \ g++ ca-certificates curl libssl-dev:armhf \ - libv4l-dev:armhf libudev-dev:armhf + libv4l-dev:armhf libudev-dev:armhf protobuf-compiler:armhf # Link the container to the Akri repository LABEL org.opencontainers.image.source https://github.com/project-akri/akri diff --git a/build/containers/intermediate/Dockerfile.rust-crossbuild-arm64v8 b/build/containers/intermediate/Dockerfile.rust-crossbuild-arm64v8 index 5e4eae224..1088ac0b4 100644 --- a/build/containers/intermediate/Dockerfile.rust-crossbuild-arm64v8 +++ b/build/containers/intermediate/Dockerfile.rust-crossbuild-arm64v8 @@ -19,7 +19,7 @@ RUN sed -i 's/^deb h'/'deb [arch=amd64,i386] h/' /etc/apt/sources.list && \ apt-get update && \ apt-get install -y --no-install-recommends pkg-config:arm64 \ g++ ca-certificates curl libssl-dev:arm64 \ - libv4l-dev:arm64 libudev-dev:arm64 + libv4l-dev:arm64 libudev-dev:arm64 protobuf-compiler:arm64 # Link the container to the Akri repository -LABEL org.opencontainers.image.source https://github.com/project-akri/akri \ No newline at end of file +LABEL org.opencontainers.image.source https://github.com/project-akri/akri diff --git a/build/intermediate-containers.mk b/build/intermediate-containers.mk index 457956d9b..812a8891b 100644 --- a/build/intermediate-containers.mk +++ b/build/intermediate-containers.mk @@ -1,5 +1,5 @@ -BUILD_RUST_CROSSBUILD_VERSION = 0.0.7 +BUILD_RUST_CROSSBUILD_VERSION = 0.0.8 BUILD_OPENCV_BASE_VERSION = 0.0.10