From d817c0bf18b8360bf30fb9a3179194b065d1121e Mon Sep 17 00:00:00 2001 From: Ajin Abraham Date: Mon, 28 Oct 2024 03:35:56 -0700 Subject: [PATCH] HOTFIX: Update wkhtmltopdf and dependencies --- Dockerfile | 6 ++---- scripts/dependencies.sh | 9 +-------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index b3d2a120..30da480e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,10 +22,8 @@ ENV DEBIAN_FRONTEND=noninteractive \ MOBSF_ADB_BINARY=/usr/bin/adb \ JDK_FILE=openjdk-22.0.2_linux-x64_bin.tar.gz \ JDK_FILE_ARM=openjdk-22.0.2_linux-aarch64_bin.tar.gz \ - LIBSSL_FILE=libssl1.1_1.1.1w-0+deb11u1_amd64.deb \ - LIBSSL_FILE_ARM=libssl1.1_1.1.1w-0+deb11u1_arm64.deb \ - WKH_FILE=wkhtmltox_0.12.6.1-2.bullseye_amd64.deb \ - WKH_FILE_ARM=wkhtmltox_0.12.6.1-2.bullseye_arm64.deb \ + WKH_FILE=wkhtmltox_0.12.6.1-3.bookworm_amd64.deb \ + WKH_FILE_ARM=wkhtmltox_0.12.6.1-3.bookworm_arm64.deb \ JAVA_HOME=/jdk-22.0.2 \ PATH=/jdk-22.0.2/bin:/root/.local/bin:$PATH \ DJANGO_SUPERUSER_USERNAME=mobsf \ diff --git a/scripts/dependencies.sh b/scripts/dependencies.sh index acbfe1e5..93ffb601 100755 --- a/scripts/dependencies.sh +++ b/scripts/dependencies.sh @@ -7,20 +7,13 @@ if [ "$TARGETPLATFORM" == "linux/arm64" ] then WKH_FILE=$WKH_FILE_ARM JDK_FILE=$JDK_FILE_ARM - LIBSSL_FILE=$LIBSSL_FILE_ARM fi echo "Target platform identified as $TARGETPLATFORM" JDK_URL="https://download.java.net/java/GA/jdk22.0.2/c9ecb94cd31b495da20a27d4581645e8/9/GPL/${JDK_FILE}" -WKH_URL="https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/${WKH_FILE}" -LIBSSL11_URL="http://ftp.us.debian.org/debian/pool/main/o/openssl/${LIBSSL_FILE}" +WKH_URL="https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/${WKH_FILE}" # Download and install wkhtmltopdf -# Install dependencies for wkhtmltopdf -echo "Installing $LIBSSL_FILE ..." -wget --quiet -O /tmp/${LIBSSL_FILE} "${LIBSSL11_URL}" && \ - dpkg -i /tmp/${LIBSSL_FILE} && \ - rm -f /tmp/${LIBSSL_FILE} echo "Installing $WKH_FILE ..." wget --quiet -O /tmp/${WKH_FILE} "${WKH_URL}" && \