From 2861330d0987d753fdd4e461dd53e9ff37b2411e Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Mon, 21 Feb 2022 12:16:12 +0000 Subject: [PATCH] Dockerfile: Remove classic virtiofsd from container Signed-off-by: Rob Bradford --- resources/Dockerfile | 8 -------- scripts/dev_cli.sh | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/resources/Dockerfile b/resources/Dockerfile index 7d8f8ae0d..ee923d44e 100644 --- a/resources/Dockerfile +++ b/resources/Dockerfile @@ -106,14 +106,6 @@ RUN echo 'source $CARGO_HOME/env' >> $HOME/.bashrc \ && mkdir $HOME/.cargo \ && ln -s $CARGO_HOME/env $HOME/.cargo/env -# install virtiofsd -RUN git clone --depth 1 https://gitlab.com/virtio-fs/qemu.git -b qemu5.0-virtiofs-dax \ - && cd qemu \ - && ./configure --prefix=$PWD --target-list=x86_64-softmmu \ - && make virtiofsd -j `nproc` \ - && cp virtiofsd /usr/local/bin \ - && cd .. && rm -rf qemu - # install SPDK NVMe # only for 'x86_64' platform images as 'docker buildx' can't build 'spdk' RUN if [ "$TARGETARCH" = "amd64" ]; then \ diff --git a/scripts/dev_cli.sh b/scripts/dev_cli.sh index 6fb323f59..5edd35c04 100755 --- a/scripts/dev_cli.sh +++ b/scripts/dev_cli.sh @@ -7,7 +7,7 @@ CLI_NAME="Cloud Hypervisor" CTR_IMAGE_TAG="cloudhypervisor/dev" -CTR_IMAGE_VERSION="20220218-0" +CTR_IMAGE_VERSION="20220221-0" CTR_IMAGE="${CTR_IMAGE_TAG}:${CTR_IMAGE_VERSION}" DOCKER_RUNTIME="docker"