diff --git a/Dockerfile b/Dockerfile index 34a2530..14cf91f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,9 @@ FROM ghcr.io/linuxserver/unrar:latest as unrar -FROM ghcr.io/by275/libtorrent:2-alpine3.19 as libtorrent +FROM ghcr.io/by275/libtorrent:2-alpine3.20 as libtorrent -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 # set version label ARG BUILD_DATE @@ -47,11 +47,12 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \ + pip install -U --no-cache --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \ click \ flexget==${FLEXGET_VERSION#v} \ requests \ -r requirements-docker.txt && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ @@ -61,7 +62,7 @@ RUN \ COPY --from=libtorrent /libtorrent-build/usr/lib/libtorrent-rasterbar.* /usr/lib/ -COPY --from=libtorrent /libtorrent-build/usr/lib/python3.11 /lsiopy/lib/python3.11 +COPY --from=libtorrent /libtorrent-build/usr/lib/python3.12 /lsiopy/lib/python3.12 # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 9be5bb5..d5e717f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -2,9 +2,9 @@ FROM ghcr.io/linuxserver/unrar:arm64v8-latest as unrar -FROM ghcr.io/by275/libtorrent:2-alpine3.19 as libtorrent +FROM ghcr.io/by275/libtorrent:2-alpine3.20 as libtorrent -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -47,11 +47,12 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \ + pip install -U --no-cache --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \ click \ flexget==${FLEXGET_VERSION#v} \ requests \ -r requirements-docker.txt && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ @@ -61,7 +62,7 @@ RUN \ COPY --from=libtorrent /libtorrent-build/usr/lib/libtorrent-rasterbar.* /usr/lib/ -COPY --from=libtorrent /libtorrent-build/usr/lib/python3.11 /lsiopy/lib/python3.11 +COPY --from=libtorrent /libtorrent-build/usr/lib/python3.12 /lsiopy/lib/python3.12 # add local files COPY root/ / diff --git a/Jenkinsfile b/Jenkinsfile index 398f143..a00e709 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,8 +34,8 @@ pipeline { CI_PORT='5050' 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 8f55d23..0f84603 100644 --- a/README.md +++ b/README.md @@ -296,6 +296,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **19.06.24:** - Rebase to Alpine 3.20. * **20.03.24:** - Rebase to Alpine 3.19. * **07.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 5033b28..b6ae7a0 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,7 +6,6 @@ external_type: github_stable release_type: stable release_tag: latest ls_branch: main -build_armhf: false repo_vars: - EXT_GIT_BRANCH = 'master' - EXT_USER = 'flexget' @@ -25,8 +24,8 @@ repo_vars: - CI_PORT='5050' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' sponsor_links: - { name: "FlexGet", url: "https://github.com/sponsors/gazpachoking/" } diff --git a/readme-vars.yml b/readme-vars.yml index 6903916..d058ae8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -6,16 +6,12 @@ project_url: "http://flexget.com/" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/flexget-banner.png" project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a multipurpose automation tool for all of your media." project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" -project_blurb_optional_extras_enabled: false # supported architectures available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} -# development version -development_versions: false - # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" @@ -57,6 +53,7 @@ app_setup_block: | # changelog changelogs: + - { date: "19.06.24:", desc: "Rebase to Alpine 3.20."} - { date: "20.03.24:", desc: "Rebase to Alpine 3.19."} - { date: "07.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."}