From 3ecaf53e87bd11c7037a9b32737611a13f8b574a Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 24 May 2024 15:06:35 +0100 Subject: [PATCH] Rebase to 3.20 --- Dockerfile | 5 +++-- Dockerfile.aarch64 | 5 +++-- Jenkinsfile | 6 +++--- README.md | 1 + jenkins-vars.yml | 9 ++++----- readme-vars.yml | 13 +------------ 6 files changed, 15 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3448eec..f054fe7 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 @@ -48,7 +48,7 @@ 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/ -r requirements.txt && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r requirements.txt && \ echo "**** build sab translations ****" && \ python3 tools/make_mo.py && \ echo "**** install par2cmdline-turbo from source ****" && \ @@ -67,6 +67,7 @@ RUN \ make && \ make check && \ make install && \ + 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 4ef2b73..ab759de 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 @@ -48,7 +48,7 @@ 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/ -r requirements.txt && \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ -r requirements.txt && \ echo "**** build sab translations ****" && \ python3 tools/make_mo.py && \ echo "**** install par2cmdline-turbo from source ****" && \ @@ -67,6 +67,7 @@ RUN \ make && \ make check && \ make install && \ + 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 37ad613..91891db 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,9 +33,9 @@ pipeline { CI_WEB='true' CI_PORT='8080' CI_SSL='false' - CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DELAY='60' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index 0aea840..3b06447 100644 --- a/README.md +++ b/README.md @@ -303,6 +303,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **24.05.24:** - Rebase to Alpine 3.20. * **23.03.24:** - Remove nzb-notify as apprise is now directly supported. * **23.12.23:** - Rebase to Alpine 3.19. * **23.11.23:** - Build translations. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 1f8121a..265e3da 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,7 +6,6 @@ external_type: github_commit release_type: prerelease release_tag: nightly ls_branch: nightly -build_armhf: false repo_vars: - EXT_GIT_BRANCH = 'develop' - EXT_USER = 'sabnzbd' @@ -24,10 +23,10 @@ repo_vars: - CI_WEB='true' - CI_PORT='8080' - CI_SSL='false' - - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DELAY='60' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' sponsor_links: - { name: "SABnzbd", url: "https://sabnzbd.org/donate" } - + diff --git a/readme-vars.yml b/readme-vars.yml index b9c00dc..ccff985 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -20,28 +20,16 @@ development_versions_items: # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" -param_usage_include_net: false -param_usage_include_env: true -param_env_vars: - - {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London."} param_usage_include_vols: true param_volumes: - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } param_usage_include_ports: true param_ports: - {external_port: "8080", internal_port: "8080", port_desc: "HTTP port for the WebUI."} -param_device_map: false -cap_add_param: false -# optional container parameters -opt_param_usage_include_env: false opt_param_usage_include_vols: true opt_param_volumes: - {vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Local path for finished downloads."} - {vol_path: "/incomplete-downloads", vol_host_path: "/path/to/incomplete/downloads", desc: "Local path for incomplete-downloads."} -opt_param_usage_include_ports: false -opt_param_device_map: false -opt_cap_add_param: false -optional_block_1: false # application setup block app_setup_block_enabled: true app_setup_block: | @@ -65,6 +53,7 @@ app_setup_block: | # changelog changelogs: + - {date: "24.05.24:", desc: "Rebase to Alpine 3.20."} - {date: "23.03.24:", desc: "Remove nzb-notify as apprise is now directly supported."} - {date: "23.12.23:", desc: "Rebase to Alpine 3.19."} - {date: "23.11.23:", desc: "Build translations."}