Skip to content

Commit

Permalink
Rebase to 3.20
Browse files Browse the repository at this point in the history
  • Loading branch information
thespad committed Jun 27, 2024
1 parent bcba689 commit 98008dd
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 18 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 && \
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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**

Expand Down Expand Up @@ -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.
Expand Down
5 changes: 2 additions & 3 deletions jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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" }
10 changes: 3 additions & 7 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"

Expand All @@ -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
Expand All @@ -28,27 +27,24 @@ 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**
For general usage please see the pyLoad wiki [here](https://github.com/pyload/pyload/wiki) .
# 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."}
Expand Down

0 comments on commit 98008dd

Please sign in to comment.