From 98008dd63678786b1ee8ee6d9cc4ece3fbc03967 Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 27 Jun 2024 16:13:04 +0100 Subject: [PATCH] Rebase to 3.20 --- Dockerfile | 5 +++-- Dockerfile.aarch64 | 5 +++-- Jenkinsfile | 4 ++-- README.md | 5 +++-- jenkins-vars.yml | 5 ++--- readme-vars.yml | 10 +++------- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 84f9b9c..300c643 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/unrar:latest as unrar -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 # set version label ARG BUILD_DATE @@ -40,8 +40,9 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \ pyload-ng[all]=="${PYLOAD_VERSION}" && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d94ee10..d7a05d3 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -2,7 +2,7 @@ FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -40,8 +40,9 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \ pyload-ng[all]=="${PYLOAD_VERSION}" && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Jenkinsfile b/Jenkinsfile index e8dd7db..d9fb84f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,8 +32,8 @@ pipeline { CI_PORT='8000' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index 70f0a0f..95fe979 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Find us at: [pyLoad](https://pyload.net/) is a Free and Open Source download manager written in Python and designed to be extremely lightweight, easily extensible and fully manageable via web. -[![pyload-ng](https://pyload.net/img/banner.png)](https://pyload.net/) +[![pyload-ng](https://github.com/linuxserver/docker-templates/raw/master/linuxserver.io/img/pyload-logo.png)](https://pyload.net/) ## Supported Architectures @@ -68,7 +68,7 @@ This image provides various versions that are available via tags. Please read th ## Application Setup -Access the web interface at `http://your-ip:8000` the default login is: +Access the web interface at `http://your-ip:8000` the default login is: username - **pyload** password - **pyload** @@ -290,6 +290,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **27.06.24:** - Rebase to Alpine 3.20. * **23.12.23:** - Rebase to Alpine 3.19. * **08.10.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). * **10.08.23:** - Bump unrar to 6.2.10. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index dd1f555..8b11553 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,7 +6,6 @@ external_type: pip_version release_type: stable release_tag: latest ls_branch: main -build_armhf: false repo_vars: - EXT_PIP = 'pyload-ng' - BUILD_VERSION_ARG = 'PYLOAD_VERSION' @@ -23,8 +22,8 @@ repo_vars: - CI_PORT='8000' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' sponsor_links: - { name: "pyLoad", url: "https://PayPal.Me/nitzo2001/0usd" } diff --git a/readme-vars.yml b/readme-vars.yml index e1470b1..778c304 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -3,7 +3,7 @@ # project information project_name: pyload-ng project_url: "https://pyload.net/" -project_logo: "https://pyload.net/img/banner.png" +project_logo: "https://github.com/linuxserver/docker-templates/raw/master/linuxserver.io/img/pyload-logo.png" project_blurb: "[pyLoad]({{ project_url }}) is a Free and Open Source download manager written in Python and designed to be extremely lightweight, easily extensible and fully manageable via web." project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" @@ -18,7 +18,6 @@ development_versions_items: - { tag: "latest", desc: "Stable releases from pyLoad Next" } - { tag: "develop", desc: "Releases from pyload Next develop branch" } - # container parameters param_container_name: "{{ project_name }}" param_usage_include_vols: true @@ -28,20 +27,16 @@ param_volumes: param_usage_include_ports: true param_ports: - { external_port: "8000", internal_port: "8000", port_desc: "Allows HTTP access to the application" } -param_usage_include_env: true -param_env_vars: - - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"} # optional params opt_param_usage_include_ports: true opt_param_ports: - { external_port: "9666", internal_port: "9666", port_desc: "Click'n'Load port." } - # application setup block app_setup_block_enabled: true app_setup_block: | - Access the web interface at `http://your-ip:8000` the default login is: + Access the web interface at `http://your-ip:8000` the default login is: username - **pyload** password - **pyload** @@ -49,6 +44,7 @@ app_setup_block: | # changelog changelogs: + - { date: "27.06.24:", desc: "Rebase to Alpine 3.20."} - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."} - { date: "08.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} - { date: "10.08.23:", desc: "Bump unrar to 6.2.10."}