diff --git a/.github/workflows/docker-image.yaml b/.github/workflows/docker-image.yaml index dfcf75d0a..ec8ef6dd4 100644 --- a/.github/workflows/docker-image.yaml +++ b/.github/workflows/docker-image.yaml @@ -41,7 +41,7 @@ jobs: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} # generate Docker tags based on the following events/attributes tags: | - type=raw,value=20250222-0 + type=raw,value=20250228-0 type=sha - name: Build and push diff --git a/resources/Dockerfile b/resources/Dockerfile index 3780f21d5..286f0d9b7 100644 --- a/resources/Dockerfile +++ b/resources/Dockerfile @@ -135,7 +135,7 @@ RUN rm /usr/lib/python3.12/EXTERNALLY-MANAGED \ && if [ "$TARGETARCH" = "amd64" ]; then \ make -j $(nproc) TARGET_ARCHITECTURE=skylake; \ elif [ "$TARGETARCH" = "arm64" ]; then \ - make -j $(nproc) DPDKBUILD_FLAGS="-Dplatform=generic"; \ + make -j $(nproc) TARGET_ARCHITECTURE="armv8.2-a" DPDKBUILD_FLAGS="-Dplatform=generic"; \ else \ echo "Unsupported architecture: ${TARGETARCH}" && exit 1; \ fi \ @@ -143,6 +143,7 @@ RUN rm /usr/lib/python3.12/EXTERNALLY-MANAGED \ && mkdir /usr/local/bin/spdk-nvme \ && cp -f ./build/bin/nvmf_tgt /usr/local/bin/spdk-nvme \ && cp -f ./scripts/rpc.py /usr/local/bin/spdk-nvme \ + && cp -rf ./python/spdk/ /usr/local/bin/spdk-nvme \ && cp -rf ./python /usr/local/bin \ && cd .. && rm -rf spdk diff --git a/scripts/dev_cli.sh b/scripts/dev_cli.sh index a97ad1a55..373b4a8e1 100755 --- a/scripts/dev_cli.sh +++ b/scripts/dev_cli.sh @@ -9,7 +9,7 @@ CLI_NAME="Cloud Hypervisor" CTR_IMAGE_TAG="ghcr.io/cloud-hypervisor/cloud-hypervisor" # Needs to match explicit version in docker-image.yaml workflow -CTR_IMAGE_VERSION="20250222-0" +CTR_IMAGE_VERSION="20250228-0" : "${CTR_IMAGE:=${CTR_IMAGE_TAG}:${CTR_IMAGE_VERSION}}" DOCKER_RUNTIME="docker"