From a6f5e3493c9ccb61ff6baede1ada6b8f45a3d133 Mon Sep 17 00:00:00 2001 From: aptalca Date: Mon, 24 Jan 2022 14:49:30 -0500 Subject: [PATCH] develop: replace unrar with p7zip --- .github/FUNDING.yml | 1 + Dockerfile | 12 +----------- Dockerfile.aarch64 | 12 +----------- Dockerfile.armhf | 12 +----------- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 2 ++ readme-vars.yml | 1 + root/donate.txt | 1 + 9 files changed, 10 insertions(+), 34 deletions(-) create mode 100644 root/donate.txt diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 7eaac77..35a5e66 100755 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,3 @@ github: linuxserver open_collective: linuxserver +custom: ["https://PayPal.Me/nitzo2001/0usd",] diff --git a/Dockerfile b/Dockerfile index 37b4cc3..3d2489c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,21 +25,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_COMMIT+x} ]; then \ PYLOAD_COMMIT=$(curl -sX GET "https://api.github.com/repos/pyload/pyload/branches/develop" \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a4f8615..60f77a2 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -25,21 +25,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_COMMIT+x} ]; then \ PYLOAD_COMMIT=$(curl -sX GET "https://api.github.com/repos/pyload/pyload/branches/develop" \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 58331ee..60900f8 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -25,21 +25,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_COMMIT+x} ]; then \ PYLOAD_COMMIT=$(curl -sX GET "https://api.github.com/repos/pyload/pyload/branches/develop" \ diff --git a/Jenkinsfile b/Jenkinsfile index 26aea00..c8b4938 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,7 +59,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( diff --git a/README.md b/README.md index c0eaba1..2ae1f8c 100644 --- a/README.md +++ b/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. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 065a486..48dbe64 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -27,3 +27,5 @@ repo_vars: - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' - CI_WEBPATH='' +sponsor_links: + - { name: "pyLoad", url: "https://PayPal.Me/nitzo2001/0usd" } diff --git a/readme-vars.yml b/readme-vars.yml index 3d66987..98912e6 100644 --- a/readme-vars.yml +++ b/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." } diff --git a/root/donate.txt b/root/donate.txt new file mode 100644 index 0000000..b4cfa70 --- /dev/null +++ b/root/donate.txt @@ -0,0 +1 @@ +pyLoad: https://PayPal.Me/nitzo2001/0usd