diff --git a/Dockerfile b/Dockerfile index 133000e691..5999ee0634 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 # set version label ARG BUILD_DATE @@ -35,6 +35,7 @@ RUN \ chown -R root:root /app/Jackett && \ echo "**** save docker image version ****" && \ echo "${VERSION}" > /etc/docker-image && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* @@ -44,4 +45,5 @@ COPY root/ / # ports and volumes VOLUME /config + EXPOSE 9117 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e5e6f40aaa..c5208e8e0b 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -35,6 +35,7 @@ RUN \ chown -R root:root /app/Jackett && \ echo "**** save docker image version ****" && \ echo "${VERSION}" > /etc/docker-image && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* @@ -44,4 +45,5 @@ COPY root/ / # ports and volumes VOLUME /config + EXPOSE 9117 diff --git a/Jenkinsfile b/Jenkinsfile index bb01c79d59..81d305def4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,9 +33,9 @@ pipeline { CI_WEB='true' CI_PORT='9117' 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 81dfc4ae87..5c001eb4c0 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ services: - AUTO_UPDATE=true #optional - RUN_OPTS= #optional volumes: - - /path/to/data:/config + - /path/to/jackett/data:/config - /path/to/blackhole:/downloads ports: - 9117:9117 @@ -99,7 +99,7 @@ docker run -d \ -e AUTO_UPDATE=true `#optional` \ -e RUN_OPTS= `#optional` \ -p 9117:9117 \ - -v /path/to/data:/config \ + -v /path/to/jackett/data:/config \ -v /path/to/blackhole:/downloads \ --restart unless-stopped \ lscr.io/linuxserver/jackett:latest @@ -281,6 +281,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **31.05.24:** - Rebase to Alpine 3.20. * **11.03.24:** - Rebase to Alpine 3.19. Deprecate development tag as upstream is publishing nightly stable releases. * **11.07.23:** - Rebase to Alpine 3.18. * **01.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 2755bbe261..442c2d2241 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -23,7 +23,7 @@ repo_vars: - CI_WEB='true' - CI_PORT='9117' - CI_SSL='false' - - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DELAY='60' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' diff --git a/readme-vars.yml b/readme-vars.yml index 563fb5b80a..c1abfe727d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -6,42 +6,27 @@ project_url: "https://github.com/Jackett/Jackett" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jackett-banner.png" project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) works as a proxy server: it translates queries from apps (Sonarr, SickRage, CouchPotato, Mylar, etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. This allows for getting recent uploads (like RSS) and performing searches. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps." 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 -development_versions_items: - - {tag: "latest", desc: "Stable Jackett Releases"} - - {tag: "development", desc: "Latest Jackett Releases"} + # 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/data", desc: "Where Jackett should store its config file."} + - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Where Jackett should store its config file."} - {vol_path: "/downloads", vol_host_path: "/path/to/blackhole", desc: "Path to torrent blackhole."} param_usage_include_ports: true param_ports: - {external_port: "9117", internal_port: "9117", port_desc: "WebUI"} -param_device_map: false -cap_add_param: false # optional container parameters opt_param_usage_include_env: true opt_param_env_vars: - {env_var: "AUTO_UPDATE", env_value: "true", desc: "Allow Jackett to update inside of the container (currently recommended by Jackett and enabled by default)"} - {env_var: "RUN_OPTS", env_value: "", desc: "Optionally specify additional arguments to be passed."} -opt_param_usage_include_vols: false -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: | @@ -49,6 +34,7 @@ app_setup_block: | More info at [{{ project_name|capitalize }}]({{ project_url }}). # changelog changelogs: + - {date: "31.05.24:", desc: "Rebase to Alpine 3.20."} - {date: "11.03.24:", desc: "Rebase to Alpine 3.19. Deprecate development tag as upstream is publishing nightly stable releases."} - {date: "11.07.23:", desc: "Rebase to Alpine 3.18."} - {date: "01.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}