From 376b6769108402bc0edd0f80585741b75b882f38 Mon Sep 17 00:00:00 2001
From: Anatol Belski <anbelski@linux.microsoft.com>
Date: Fri, 4 Aug 2023 09:59:32 +0200
Subject: [PATCH] Dockerfile: Build SPDK for skylake

As the container image can be used on both Intel and AMD,
ensure the SPDK binaries are compatible. This implies -march=skylake
passed to the underlaying toolchain.

Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>
---
 resources/Dockerfile | 2 +-
 scripts/dev_cli.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/Dockerfile b/resources/Dockerfile
index da085b7ce..a46fbe820 100644
--- a/resources/Dockerfile
+++ b/resources/Dockerfile
@@ -136,7 +136,7 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \
        && ./scripts/pkgdep.sh \
        && apt-get clean \
        && ./configure --with-vfio-user \
-       && make -j $(nproc) \
+       && make -j $(nproc) TARGET_ARCHITECTURE=skylake \
        && mkdir /usr/local/bin/spdk-nvme \
        && cp ./build/bin/nvmf_tgt /usr/local/bin/spdk-nvme \
        && cp ./scripts/rpc.py /usr/local/bin/spdk-nvme \
diff --git a/scripts/dev_cli.sh b/scripts/dev_cli.sh
index 618c39178..662164b7d 100755
--- a/scripts/dev_cli.sh
+++ b/scripts/dev_cli.sh
@@ -7,7 +7,7 @@
 CLI_NAME="Cloud Hypervisor"
 
 CTR_IMAGE_TAG="ghcr.io/cloud-hypervisor/cloud-hypervisor"
-CTR_IMAGE_VERSION="20230620-0"
+CTR_IMAGE_VERSION="20230804-0"
 : "${CTR_IMAGE:=${CTR_IMAGE_TAG}:${CTR_IMAGE_VERSION}}"
 
 DOCKER_RUNTIME="docker"