From 5ede3e3bf04722b536d6bd2b07b6bd28d88e1ca2 Mon Sep 17 00:00:00 2001
From: Julien Cabillot <julien.cabillot@ubisoft.com>
Date: Fri, 24 Feb 2023 16:55:18 -0500
Subject: [PATCH] feat: mega update

---
 Dockerfile  | 18 ++++++++++--------
 Jenkinsfile |  1 +
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 85649e3..5af1efb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM "debian:stretch"
+FROM "debian:buster"
 LABEL maintainer="Julien Cabillot <dockerimages@cabillot.eu>"
 
 RUN groupadd -r -g 666 sabnzbd && \
@@ -21,18 +21,20 @@ ENV LANG C.UTF-8
 # Install SABnzbd and all required dependencies.
 #
 
-RUN export SABNZBD_VERSION=2.3.0 PAR2CMDLINE_VERSION=v0.6.14-mt1 && \
+RUN export SABNZBD_VERSION=3.7.2 PAR2CMDLINE_VERSION=v0.6.14-mt1 && \
     export DEBIAN_FRONTEND=noninteractive && \
-    export BUILD_PACKAGES="automake build-essential python-dev python-pip" && \
-    export RUNTIME_PACKAGES="ca-certificates p7zip-full python-cheetah python-yenc unrar unzip libgomp1 openssl python-cryptography python-openssl curl" && \
+    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/ main$/ main contrib non-free/" /etc/apt/sources.list && \
     apt-get -qq update && \
     apt-get -qq --yes install $BUILD_PACKAGES $RUNTIME_PACKAGES && \
-    pip install $PIP_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 && \
+    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} && \
     tar xzf /tmp/par2cmdline-mt.tar.gz -C /tmp && \
@@ -51,8 +53,8 @@ RUN export SABNZBD_VERSION=2.3.0 PAR2CMDLINE_VERSION=v0.6.14-mt1 && \
            "/var/lib/apt/lists/"* \
            "/usr/src/"* \
            "/var/cache/"* \
-       "/var/log/"{apt/*,dpkg.log} \
-       "/var/www/html" \
+           "/var/log/"{apt/*,dpkg.log} \
+           "/var/www/html" \
            "/tmp/"*
 
 #
@@ -70,7 +72,7 @@ EXPOSE 8080
 WORKDIR "/sabnzbd"
 
 # Add Tini
-ENV "TINI_VERSION" "v0.16.1"
+ENV "TINI_VERSION" "v0.19.0"
 ADD "https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini" "/tini"
 RUN chmod +x "/tini"
 #ENTRYPOINT ["/tini", "--"]
diff --git a/Jenkinsfile b/Jenkinsfile
index 59c7afc..ba2b79a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,6 +3,7 @@ pipeline {
     registry = 'https://registry.hub.docker.com'
     registryCredential = 'dockerhub_jcabillot'
     dockerImage = 'jcabillot/sabnzbd'
+    DOCKER_BUILDKIT = '1'
   }
 
   agent any