Skip to content

Commit

Permalink
ci: try to fix linux sdk docker build
Browse files Browse the repository at this point in the history
Signed-off-by: Huaqi Fang <[email protected]>
  • Loading branch information
fanghuaqi committed Nov 17, 2023
1 parent 9b1aac0 commit 57331f2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/apt.txt
Original file line number Diff line number Diff line change
@@ -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
5 changes: 4 additions & 1 deletion .github/linuxsdk.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 57331f2

Please sign in to comment.