Merge pull request #3 from linuxserver/p7zip

replace unrar with p7zip

Author: aptalca

.github/FUNDING.yml

@@ -1,2 +1,3 @@
 github: linuxserver
 open_collective: linuxserver
+custom: ["https://PayPal.Me/nitzo2001/0usd",]

Dockerfile

@@ -24,21 +24,11 @@ RUN \
   apk add --no-cache \
     curl \
     libjpeg-turbo \
+    p7zip \
     py3-pip \
     python3 \
     sqlite \
     tesseract-ocr && \
-  echo "**** install unrar ****" && \
-  mkdir /tmp/unrar && \
-  curl -o /tmp/unrar.tar.gz \
-    -L "https://www.rarlab.com/rar/unrarsrc-6.1.4.tar.gz" && \
-  tar xf /tmp/unrar.tar.gz -C \
-    /tmp/unrar --strip-components=1 && \
-  cd /tmp/unrar && \
-  make && \
-  make install && \
-  mkdir -p /usr/share/licenses/unrar && \
-  mv license.txt /usr/share/licenses/unrar/ && \
   echo "**** install pyload ****" && \
   if [ -z ${PYLOAD_VERSION+x} ]; then \
     PYLOAD="pyload-ng[all]"; \

Dockerfile.aarch64

@@ -24,21 +24,11 @@ RUN \
   apk add --no-cache \
     curl \
     libjpeg-turbo \
+    p7zip \
     py3-pip \
     python3 \
     sqlite \
     tesseract-ocr && \
-  echo "**** install unrar ****" && \
-  mkdir /tmp/unrar && \
-  curl -o /tmp/unrar.tar.gz \
-    -L "https://www.rarlab.com/rar/unrarsrc-6.1.4.tar.gz" && \
-  tar xf /tmp/unrar.tar.gz -C \
-    /tmp/unrar --strip-components=1 && \
-  cd /tmp/unrar && \
-  make && \
-  make install && \
-  mkdir -p /usr/share/licenses/unrar && \
-  mv license.txt /usr/share/licenses/unrar/ && \
   echo "**** install pyload ****" && \
   if [ -z ${PYLOAD_VERSION+x} ]; then \
     PYLOAD="pyload-ng[all]"; \

Dockerfile.armhf

@@ -24,21 +24,11 @@ RUN \
   apk add --no-cache \
     curl \
     libjpeg-turbo \
+    p7zip \
     py3-pip \
     python3 \
     sqlite \
     tesseract-ocr && \
-  echo "**** install unrar ****" && \
-  mkdir /tmp/unrar && \
-  curl -o /tmp/unrar.tar.gz \
-    -L "https://www.rarlab.com/rar/unrarsrc-6.1.4.tar.gz" && \
-  tar xf /tmp/unrar.tar.gz -C \
-    /tmp/unrar --strip-components=1 && \
-  cd /tmp/unrar && \
-  make && \
-  make install && \
-  mkdir -p /usr/share/licenses/unrar && \
-  mv license.txt /usr/share/licenses/unrar/ && \
   echo "**** install pyload ****" && \
   if [ -z ${PYLOAD_VERSION+x} ]; then \
     PYLOAD="pyload-ng[all]"; \

Jenkinsfile

@@ -57,7 +57,7 @@ pipeline {
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(

README.md

@@ -237,4 +237,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **24.01.22:** - Replace unrar with p7zip.
 * **24.01.22:** - Initial release.

jenkins-vars.yml

@@ -25,3 +25,5 @@ repo_vars:
   - CI_DOCKERENV='TZ=US/Pacific'
   - CI_AUTH='user:password'
   - CI_WEBPATH=''
+sponsor_links:
+  - { name: "pyLoad", url: "https://PayPal.Me/nitzo2001/0usd" }

readme-vars.yml

@@ -50,4 +50,5 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "24.01.22:", desc: "Replace unrar with p7zip." }
   - { date: "24.01.22:", desc: "Initial release." }

root/donate.txt

@@ -0,0 +1 @@
+pyLoad: https://PayPal.Me/nitzo2001/0usd