From 38b7a80a90971187fb5ed0507c2ff516019eaa4f Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 13 Sep 2023 13:31:24 +0100 Subject: [PATCH 1/2] Switch to par2cmdline-turbo --- Dockerfile | 23 ++++++++++++++++++++--- Dockerfile.aarch64 | 25 +++++++++++++++++++++---- README.md | 1 + readme-vars.yml | 1 + 4 files changed, 43 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 85b14d9..6f1ae40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,8 @@ ENV HOME="/config" \ RUN \ echo "**** install packages ****" && \ apk add -U --update --no-cache --virtual=build-dependencies \ + autoconf \ + automake \ build-base \ cargo \ libffi-dev \ @@ -27,9 +29,8 @@ RUN \ python3-dev && \ apk add -U --update --no-cache \ 7zip \ - par2cmdline \ python3 && \ - echo "**** install sabnzbd ****" && \ + echo "**** install sabnzbd ****" && \ if [ -z ${SABNZBD_VERSION+x} ]; then \ SABNZBD_VERSION=$(curl -s https://api.github.com/repos/sabnzbd/sabnzbd/commits/develop \ | jq -r '. | .sha' \ @@ -52,7 +53,23 @@ RUN \ pynzb \ requests && \ pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18 -r requirements.txt && \ - echo "**** install nzb-notify ****" && \ + echo "**** install par2cmdline-turbo from source ****" && \ + PAR2_VERSION=$(curl -s https://api.github.com/repos/animetosho/par2cmdline-turbo/releases/latest \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + mkdir /tmp/par2cmdline && \ + curl -o \ + /tmp/par2cmdline.tar.gz -L \ + "https://github.com/animetosho/par2cmdline-turbo/archive/${PAR2_VERSION}.tar.gz" && \ + tar xf \ + /tmp/par2cmdline.tar.gz -C \ + /tmp/par2cmdline --strip-components=1 && \ + cd /tmp/par2cmdline && \ + ./automake.sh && \ + ./configure && \ + make && \ + make check && \ + make install && \ + echo "**** install nzb-notify ****" && \ NZBNOTIFY_VERSION=$(curl -s https://api.github.com/repos/caronc/nzb-notify/releases/latest \ | awk '/tag_name/{print $4;exit}' FS='[""]') && \ mkdir -p /app/nzbnotify && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 77f402e..65a6fca 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -18,6 +18,8 @@ ENV HOME="/config" \ RUN \ echo "**** install packages ****" && \ apk add -U --update --no-cache --virtual=build-dependencies \ + autoconf \ + automake \ build-base \ cargo \ libffi-dev \ @@ -27,9 +29,8 @@ RUN \ python3-dev && \ apk add -U --update --no-cache \ 7zip \ - par2cmdline \ python3 && \ - echo "**** install sabnzbd ****" && \ + echo "**** install sabnzbd ****" && \ if [ -z ${SABNZBD_VERSION+x} ]; then \ SABNZBD_VERSION=$(curl -s https://api.github.com/repos/sabnzbd/sabnzbd/commits/develop \ | jq -r '. | .sha' \ @@ -52,7 +53,23 @@ RUN \ pynzb \ requests && \ pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18 -r requirements.txt && \ - echo "**** install nzb-notify ****" && \ + echo "**** install par2cmdline-turbo from source ****" && \ + PAR2_VERSION=$(curl -s https://api.github.com/repos/animetosho/par2cmdline-turbo/releases/latest \ + | awk '/tag_name/{print $4;exit}' FS='[""]'); \ + mkdir /tmp/par2cmdline && \ + curl -o \ + /tmp/par2cmdline.tar.gz -L \ + "https://github.com/animetosho/par2cmdline-turbo/archive/${PAR2_VERSION}.tar.gz" && \ + tar xf \ + /tmp/par2cmdline.tar.gz -C \ + /tmp/par2cmdline --strip-components=1 && \ + cd /tmp/par2cmdline && \ + ./automake.sh && \ + ./configure && \ + make && \ + make check && \ + make install && \ + echo "**** install nzb-notify ****" && \ NZBNOTIFY_VERSION=$(curl -s https://api.github.com/repos/caronc/nzb-notify/releases/latest \ | awk '/tag_name/{print $4;exit}' FS='[""]') && \ mkdir -p /app/nzbnotify && \ @@ -63,7 +80,7 @@ RUN \ /tmp/nzbnotify.tar.gz -C \ /app/nzbnotify --strip-components=1 && \ cd /app/nzbnotify && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18 -r requirements.txt && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18 -r requirements.txt && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/README.md b/README.md index db115c4..d313777 100644 --- a/README.md +++ b/README.md @@ -253,6 +253,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **13.09.23:** - Use par2cmdline-turbo in place of par2cmdline. * **16.08.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). * **10.08.23:** - Bump unrar to 6.2.10. * **03.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) diff --git a/readme-vars.yml b/readme-vars.yml index 1fed894..19cd6ac 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -47,6 +47,7 @@ app_setup_block_enabled: true app_setup_block: "Initial setup is done via `http://:` ie, http://192.168.1.100:8080.\n\nSee the [SABnzbd wiki](https://sabnzbd.org/wiki/) for more information.\n\n### nzb-notify\n\nnzb-notify is included with this image as a convenience script. To use it set the Scripts folder in the Folder settings to /app/nzbnotify and then configure it under Notifications. See [nzb-notify](https://github.com/caronc/nzb-notify/) for more information.\n\n### Download folders\n\nIn Sabnzbd gui settings, under `Folders`, make sure to set the `Completed Download Folder` as `/downloads` and the `Temporary Download Folder` as `/incomplete-downloads`\n\nWe have set `/incomplete-downloads` and `/downloads` as ***optional paths***, this is because it is the easiest way to get started. While easy to use, it has some drawbacks. Mainly losing the ability to hardlink (TL;DR a way for a file to exist in multiple places on the same file system while only consuming one file worth of space), or atomic move (TL;DR instant file moves, rather than copy+delete) files while processing content.\n\nUse the optional paths if you dont understand, or dont want hardlinks/atomic moves. \n\nThe folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/docker-guide#consistent-and-well-planned-paths) on how to get started with this.\n" # changelog changelogs: + - {date: "13.09.23:", desc: "Use par2cmdline-turbo in place of par2cmdline."} - {date: "16.08.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} - {date: "10.08.23:", desc: "Bump unrar to 6.2.10."} - {date: "03.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} From 9584981209e1880f2fe61518c0e9ae63fe216f4b Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 13 Sep 2023 13:36:16 +0100 Subject: [PATCH 2/2] Add libgomp --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 6f1ae40..fc49019 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,6 +29,7 @@ RUN \ python3-dev && \ apk add -U --update --no-cache \ 7zip \ + libgomp \ python3 && \ echo "**** install sabnzbd ****" && \ if [ -z ${SABNZBD_VERSION+x} ]; then \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 65a6fca..2478375 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -29,6 +29,7 @@ RUN \ python3-dev && \ apk add -U --update --no-cache \ 7zip \ + libgomp \ python3 && \ echo "**** install sabnzbd ****" && \ if [ -z ${SABNZBD_VERSION+x} ]; then \