From 494f16bad5b5fae73ec01c19a9530c5f4893e0f0 Mon Sep 17 00:00:00 2001 From: Dorin Geman Date: Mon, 27 Oct 2025 13:13:59 +0200 Subject: [PATCH 1/3] fix(llamacpp): correct Docker ARG variable syntax in cann.Dockerfile Signed-off-by: Dorin Geman --- llamacpp/native/cann.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llamacpp/native/cann.Dockerfile b/llamacpp/native/cann.Dockerfile index 7bb38100e..a8d6c82be 100644 --- a/llamacpp/native/cann.Dockerfile +++ b/llamacpp/native/cann.Dockerfile @@ -3,7 +3,7 @@ ARG CANN_VERSION=8.0.0-910b ARG CANN_IMAGE_VARIANT=openeuler22.03 -FROM quay.io/ascend/cann:{CANN_VERSION}-{CANN_IMAGE_VARIANT}-py3.10 AS builder +FROM quay.io/ascend/cann:${CANN_VERSION}-${CANN_IMAGE_VARIANT}-py3.10 AS builder ARG TARGETARCH ARG CANN_IMAGE_VARIANT From 15ae5a38bf7fd0fe12443d78d4bf4d09abe00177 Mon Sep 17 00:00:00 2001 From: Dorin Geman Date: Mon, 27 Oct 2025 13:33:23 +0200 Subject: [PATCH 2/3] refactor(cann): use ubuntu instead of openeuler Signed-off-by: Dorin Geman --- llamacpp/native/cann.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llamacpp/native/cann.Dockerfile b/llamacpp/native/cann.Dockerfile index a8d6c82be..c4bc5c001 100644 --- a/llamacpp/native/cann.Dockerfile +++ b/llamacpp/native/cann.Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG CANN_VERSION=8.0.0-910b -ARG CANN_IMAGE_VARIANT=openeuler22.03 +ARG CANN_IMAGE_VARIANT=ubuntu22.04 FROM quay.io/ascend/cann:${CANN_VERSION}-${CANN_IMAGE_VARIANT}-py3.10 AS builder From 58915e41ced9340ac6436ca49a2a020011c8a3c8 Mon Sep 17 00:00:00 2001 From: Dorin Geman Date: Mon, 27 Oct 2025 13:33:35 +0200 Subject: [PATCH 3/3] refactor(cann): remove unused ARG declaration from builder stage Signed-off-by: Dorin Geman --- llamacpp/native/cann.Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/llamacpp/native/cann.Dockerfile b/llamacpp/native/cann.Dockerfile index c4bc5c001..4e4bf6bbb 100644 --- a/llamacpp/native/cann.Dockerfile +++ b/llamacpp/native/cann.Dockerfile @@ -5,9 +5,6 @@ ARG CANN_IMAGE_VARIANT=ubuntu22.04 FROM quay.io/ascend/cann:${CANN_VERSION}-${CANN_IMAGE_VARIANT}-py3.10 AS builder -ARG TARGETARCH -ARG CANN_IMAGE_VARIANT - RUN apt-get update && apt-get install -y cmake ninja-build git build-essential curl WORKDIR /llama-server