From e7ffcd7ea92b554a0441ed0329aded33e76185bc Mon Sep 17 00:00:00 2001 From: kulukami Date: Tue, 12 Sep 2023 20:08:42 +0800 Subject: [PATCH] update scanner arm64 dockerfile into ubuntu2204 --- .../build_script/libclamav/libclamav_linux_vcpkg_arm64.sh | 1 + .../build_script/libclamav/libclamav_linux_vcpkg_x64.sh | 1 + .../build_script/libclamav/libclamav_macos_vcpkg_arm64.sh | 1 + .../build_script/libclamav/libclamav_macos_vcpkg_x64.sh | 1 + plugins/scanner/docker/Dockerfile.linux_aarch64 | 6 +++--- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/scanner/build_script/libclamav/libclamav_linux_vcpkg_arm64.sh b/plugins/scanner/build_script/libclamav/libclamav_linux_vcpkg_arm64.sh index 642953b6e..6b713ec09 100644 --- a/plugins/scanner/build_script/libclamav/libclamav_linux_vcpkg_arm64.sh +++ b/plugins/scanner/build_script/libclamav/libclamav_linux_vcpkg_arm64.sh @@ -1,6 +1,7 @@ export VCPKG_DEFAULT_TRIPLET="arm64-linux-static" export RUSTC_TARGET="aarch64-unknown-linux-gnu" export TARGET_ARCH="arm64" +export VCPKG_FORCE_SYSTEM_BINARIES=0 sudo apt-get install g++ gcc -y rustup target add $RUSTC_TARGET diff --git a/plugins/scanner/build_script/libclamav/libclamav_linux_vcpkg_x64.sh b/plugins/scanner/build_script/libclamav/libclamav_linux_vcpkg_x64.sh index e4dfcafac..482c54eb4 100644 --- a/plugins/scanner/build_script/libclamav/libclamav_linux_vcpkg_x64.sh +++ b/plugins/scanner/build_script/libclamav/libclamav_linux_vcpkg_x64.sh @@ -1,6 +1,7 @@ export VCPKG_DEFAULT_TRIPLET="x64-linux-static" export RUSTC_TARGET="x86_64-unknown-linux-gnu" export TARGET_ARCH="x64" +export VCPKG_FORCE_SYSTEM_BINARIES=0 sudo apt-get install g++ gcc -y rustup target add $RUSTC_TARGET diff --git a/plugins/scanner/build_script/libclamav/libclamav_macos_vcpkg_arm64.sh b/plugins/scanner/build_script/libclamav/libclamav_macos_vcpkg_arm64.sh index 70cfa1015..e1765de81 100644 --- a/plugins/scanner/build_script/libclamav/libclamav_macos_vcpkg_arm64.sh +++ b/plugins/scanner/build_script/libclamav/libclamav_macos_vcpkg_arm64.sh @@ -1,6 +1,7 @@ export VCPKG_DEFAULT_TRIPLET="arm64-osx-static" export RUSTC_TARGET="aarch64-apple-darwin" export TARGET_ARCH="arm64" +export VCPKG_FORCE_SYSTEM_BINARIES=0 rustup target add $RUSTC_TARGET diff --git a/plugins/scanner/build_script/libclamav/libclamav_macos_vcpkg_x64.sh b/plugins/scanner/build_script/libclamav/libclamav_macos_vcpkg_x64.sh index 55f13c072..314ac3383 100644 --- a/plugins/scanner/build_script/libclamav/libclamav_macos_vcpkg_x64.sh +++ b/plugins/scanner/build_script/libclamav/libclamav_macos_vcpkg_x64.sh @@ -1,6 +1,7 @@ export VCPKG_DEFAULT_TRIPLET="x64-osx-static" export RUSTC_TARGET="x86_64-apple-darwin" export TARGET_ARCH="x64" +export VCPKG_FORCE_SYSTEM_BINARIES=0 rustup target add $RUSTC_TARGET diff --git a/plugins/scanner/docker/Dockerfile.linux_aarch64 b/plugins/scanner/docker/Dockerfile.linux_aarch64 index bc1df10df..ff56ddafd 100644 --- a/plugins/scanner/docker/Dockerfile.linux_aarch64 +++ b/plugins/scanner/docker/Dockerfile.linux_aarch64 @@ -1,4 +1,4 @@ -FROM debian:bullseye +FROM ubuntu:22.04 SHELL ["/bin/bash", "-c"] @@ -6,8 +6,8 @@ RUN apt update RUN apt-get install -y apt-utils gnutls-bin rsync RUN apt-get install -y apt-transport-https ca-certificates debian-archive-keyring RUN apt-get install -y bison autoconf gettext curl unzip git wget curl zip tar -RUN apt-get install -y python3.9 python3-pip python3.9-dev libc-dev -RUN apt-get install -y clang llvm flex ninja-build lsb-release +RUN apt-get install -y python3 python3-pip python3-dev libc-dev +RUN apt-get install -y clang llvm flex ninja-build lsb-release pkg-config linux-libc-dev RUN apt-get install -y libstdc++-10-dev cmake make libpcre2-dev gcc g++ ARG DEBIAN_FRONTEND=noninteractive