diff --git a/Dockerfile b/Dockerfile index dbc277a..de5d2ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster +FROM debian:trixie-20260610 LABEL maintainer="Julien Cabillot " RUN groupadd -r -g 666 sabnzbd && \ @@ -22,20 +22,20 @@ ENV LANG C.UTF-8 # # hadolint ignore=DL3008,DL3015,SC3009,DL3003,DL3013,DL3042 -RUN export SABNZBD_VERSION=3.7.2 PAR2CMDLINE_VERSION=v0.6.14-mt1 && \ +RUN export SABNZBD_VERSION=4.5.5 PAR2CMDLINE_VERSION=v0.6.14-mt1 && \ export DEBIAN_FRONTEND=noninteractive && \ + export PIP_BREAK_SYSTEM_PACKAGES=1 && \ export BUILD_PACKAGES="automake build-essential python3-dev libffi-dev" && \ - export RUNTIME_PACKAGES="ca-certificates p7zip-full python3-yenc unrar unzip libgomp1 openssl python3-openssl curl python3-pip" && \ - export PIP_PACKAGES="sabyenc" && \ - sed -i 's|http://deb.debian.org|http://archive.debian.org|g' /etc/apt/sources.list && \ - sed -i "s/ main$/ main contrib non-free/" /etc/apt/sources.list && \ + export RUNTIME_PACKAGES="ca-certificates p7zip-full unrar unzip libgomp1 openssl python3-openssl python3-cffi curl python3-pip" && \ + sed -i "s/Components: main/Components: main contrib non-free/" /etc/apt/sources.list.d/debian.sources && \ apt-get -qq update && \ apt-get -qq --yes install $BUILD_PACKAGES $RUNTIME_PACKAGES && \ - #pip3 install $PIP_PACKAGES && \ curl -SL -o /tmp/sabnzbd.tar.gz https://github.com/sabnzbd/sabnzbd/releases/download/${SABNZBD_VERSION}/SABnzbd-${SABNZBD_VERSION}-src.tar.gz && \ tar xzf /tmp/sabnzbd.tar.gz && \ mv SABnzbd-* sabnzbd && \ - pip3 install --upgrade pip && \ + sed -i '/pywin32/d' /sabnzbd/requirements.txt && \ + sed -i 's/^cffi==.*/cffi/' /sabnzbd/requirements.txt && \ + sed -i 's/^cryptography==.*/cryptography/' /sabnzbd/requirements.txt && \ pip3 install -r /sabnzbd/requirements.txt && \ chown -R sabnzbd: sabnzbd && \ curl -o /tmp/par2cmdline-mt.tar.gz https://codeload.github.com/jkansanen/par2cmdline-mt/tar.gz/${PAR2CMDLINE_VERSION} && \ @@ -82,4 +82,4 @@ RUN chmod +x "/tini" CMD ["/sabnzbd.sh"] HEALTHCHECK --interval=10s \ - CMD curl --fail "http://localhost:8080" || exit 1 + CMD curl --fail "http://localhost:8080" || exit 1 \ No newline at end of file diff --git a/tests/test.sh b/tests/test.sh index 094729c..de046a4 100644 --- a/tests/test.sh +++ b/tests/test.sh @@ -70,7 +70,7 @@ done echo "" echo "Test: GET / (SABnzbd web UI)" -RESPONSE=$(curl -s -D - "$BASE_URL/") +RESPONSE=$(curl -sL -D - "$BASE_URL/") STATUS=$(echo "$RESPONSE" | head -1 | grep -oP '\d{3}') BODY=$(echo "$RESPONSE" | sed -n '/^\r$/,$p' | tail -n +2) @@ -79,4 +79,4 @@ assert_match "Body contains SABnzbd" "[Ss][Aa][Bb].*[Nn]zbd" "$BODY" echo "" echo "Results: $PASSED/$TOTAL passed, $FAILED failed" -[ "$FAILED" -eq 0 ] +[ "$FAILED" -eq 0 ] \ No newline at end of file