fix(dockerfile): fix "/spdk not found" error

Signed-off-by: Derek Su <[email protected]>
(cherry picked from commit e3aed7d)

Dockerfile.dapper

@@ -25,8 +25,3 @@ RUN curl -sSfLO https://github.com/docker/buildx/releases/download/v0.13.1/build
     chmod +x buildx-v0.13.1.linux-${ARCH} && \
     mv buildx-v0.13.1.linux-${ARCH} /usr/local/bin/buildx
 
-ENV SPDK_COMMIT_ID 4542f9b14010fc7192d42e05adaafc2ae863bac5
-RUN cd /usr/src && \
-    git clone https://github.com/longhorn/spdk.git /spdk && \
-    cd /spdk && \
-    git checkout ${SPDK_COMMIT_ID}

dapper/package

@@ -18,10 +18,6 @@ if [ ! -e ./bin/longhornctl ]; then
     ./dapper/build
 fi
 
-# Copy SPDK scripts from the dapper container
-mkdir -p /spdk
-cp -rf /spdk/scripts spdk
-
 # Build image
 buildx build --load -t ${IMAGE} -f package/Dockerfile .
 

package/Dockerfile

@@ -1,5 +1,19 @@
 # syntax=docker/dockerfile:1.8.1
 
+FROM  registry.suse.com/bci/golang:1.22 AS builder
+
+ARG ARCH=amd64
+
+RUN zypper -n ref && \
+    zypper update -y
+
+ENV SPDK_COMMIT_ID a6478cde7e0cff2fb09992868308a7387aa5202a
+RUN cd /usr/src && \
+    git clone https://github.com/longhorn/spdk.git /spdk && \
+    cd /spdk && \
+    git checkout ${SPDK_COMMIT_ID} && \
+    rm -rf .git
+
 FROM registry.suse.com/bci/bci-base:15.6
 
 ARG TARGETPLATFORM
@@ -19,6 +33,8 @@ RUN zypper -n install jq && \
 COPY bin/longhornctl-linux-${ARCH} /usr/local/bin/longhornctl
 COPY bin/longhornctl-local-linux-${ARCH} /usr/local/bin/longhornctl-local
 
-COPY spdk /spdk
+COPY --from=builder \
+   /spdk \
+   /spdk
 
 CMD ["longhornctl"]