From fbaceea4c07e645575eca25a1bb570b439a2cf64 Mon Sep 17 00:00:00 2001 From: Sebastien Boeuf Date: Thu, 27 May 2021 12:44:14 +0200 Subject: [PATCH] resources: Add ovs-dpdk install to Dockerfile The Dockerfile is extended with some new instructions to install the OVS-DPDK packages. This will be useful for writing new integration tests and make sure OVS-DPDK is working properly. This also updates the Rust toolchain from 1.51.0 to 1.52.1. Signed-off-by: Sebastien Boeuf --- resources/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/Dockerfile b/resources/Dockerfile index 57c71106b..e088cf1c0 100644 --- a/resources/Dockerfile +++ b/resources/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:20.04 as dev ARG TARGETARCH -ARG RUST_TOOLCHAIN="1.51.0" +ARG RUST_TOOLCHAIN="1.52.1" ARG CLH_SRC_DIR="/cloud-hypervisor" ARG CLH_BUILD_DIR="$CLH_SRC_DIR/build" ARG CARGO_REGISTRY_DIR="$CLH_BUILD_DIR/cargo_registry" @@ -39,9 +39,12 @@ RUN apt-get update \ cpio \ python3-setuptools \ ntfs-3g \ + openvswitch-switch-dpdk \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* +RUN update-alternatives --set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk + RUN if [ "$TARGETARCH" = "amd64" ]; then \ apt-get update \ && apt-get -yq upgrade \