From 57331f26e43c33daa3837b084aa4db6342f8aca5 Mon Sep 17 00:00:00 2001
From: Huaqi Fang <578567190@qq.com>
Date: Fri, 17 Nov 2023 14:35:15 +0800
Subject: [PATCH] ci: try to fix linux sdk docker build

Signed-off-by: Huaqi Fang <578567190@qq.com>
---
 .github/apt.txt              | 2 +-
 .github/linuxsdk.Dockerfile  | 5 ++++-
 .github/workflows/docker.yml | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/apt.txt b/.github/apt.txt
index f7007ef..0c72360 100644
--- a/.github/apt.txt
+++ b/.github/apt.txt
@@ -1,3 +1,3 @@
 build-essential git python3 python3-pip autotools-dev make cmake texinfo bison minicom flex liblz4-tool
 libgmp-dev libmpfr-dev libmpc-dev gawk libz-dev libssl-dev libglib2.0-dev libfdt-dev libpixman-1-dev zlib1g-dev
-libncursesw5-dev libncursesw5 mtools wget cpio zip unzip rsync bc sudo device-tree-compiler
+libncursesw5-dev libncursesw5 mtools wget cpio zip unzip rsync bc sudo device-tree-compiler libpng16-16
diff --git a/.github/linuxsdk.Dockerfile b/.github/linuxsdk.Dockerfile
index a4b3c41..062e533 100644
--- a/.github/linuxsdk.Dockerfile
+++ b/.github/linuxsdk.Dockerfile
@@ -33,6 +33,7 @@ RUN rm -f /home/pipreq.txt
 ARG USER=nuclei
 ARG PASS=riscv123
 ARG QEMUVER=2023.10
+ARG BRANCH=dev_nuclei_next
 
 RUN groupadd --system $USER
 
@@ -52,7 +53,9 @@ RUN cd prebuilt && tar --no-same-owner -xzf nuclei-qemu.tar.gz
 
 ENV PATH "/home/$USER/prebuilt/qemu/bin:$PATH"
 
-RUN git clone https://github.com/Nuclei-Software/nuclei-linux-sdk
+RUN ldd `which qemu-system-riscv64`
+
+RUN git clone -b $BRANCH https://github.com/Nuclei-Software/nuclei-linux-sdk
 
 # gitee mirror no longer works
 #RUN cd nuclei-linux-sdk && git remote add gitee https://gitee.com/Nuclei-Software/nuclei-linux-sdk
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 27c641a..587976f 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Build Docker Image
         run: |
           cd .github
-          docker build . -f linuxsdk.Dockerfile -t linuxsdk:${{github.ref_name}}
+          docker build . -f linuxsdk.Dockerfile -t linuxsdk:${{github.ref_name}} --build-arg BRANCH=${{github.ref_name}}
           docker images
 
       - name: Test Docker Image