From 38d9731f565446cbf451668c39a180fb579d4ca1 Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 18 Jul 2024 16:26:07 +0100 Subject: [PATCH 1/2] Rebase to noble --- Dockerfile | 8 ++++---- Dockerfile.aarch64 | 6 +++--- Jenkinsfile | 10 +++++----- README.md | 15 ++++++++------- jenkins-vars.yml | 4 ++-- readme-vars.yml | 25 +++++++------------------ 6 files changed, 29 insertions(+), 39 deletions(-) diff --git a/Dockerfile b/Dockerfile index 37892ea3..d336ff7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy +FROM ghcr.io/linuxserver/baseimage-ubuntu:noble # set version label ARG BUILD_DATE @@ -10,15 +10,14 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="nemchik" # environment settings -ARG DEBIAN_FRONTEND="noninteractive" -ENV NZBHYDRA2_RELEASE_TYPE="Pre-Release" +ENV NZBHYDRA2_RELEASE_TYPE="Release" \ + DEBIAN_FRONTEND="noninteractive" RUN \ echo "**** install packages ****" && \ apt-get update && \ apt-get install --no-install-recommends -y \ libfreetype6 \ - openjdk-17-jre-headless \ python3 \ unzip && \ echo "**** install nzbhydra2 ****" && \ @@ -40,6 +39,7 @@ RUN \ /defaults/nzbhydra.yml -L \ "https://raw.githubusercontent.com/theotherp/nzbhydra2/v${NZBHYDRA2_VER}/core/src/main/resources/config/baseConfig.yml" && \ sed -i 's/mapIpToHost: true/mapIpToHost: false/' /defaults/nzbhydra.yml && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index dbdf70b0..323820d2 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -10,15 +10,14 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="nemchik" # environment settings -ARG DEBIAN_FRONTEND="noninteractive" -ENV NZBHYDRA2_RELEASE_TYPE="Pre-Release" +ENV NZBHYDRA2_RELEASE_TYPE="Release" \ + DEBIAN_FRONTEND="noninteractive" RUN \ echo "**** install packages ****" && \ apt-get update && \ apt-get install --no-install-recommends -y \ libfreetype6 \ - openjdk-17-jre-headless \ python3 \ unzip && \ echo "**** install nzbhydra2 ****" && \ @@ -40,6 +39,7 @@ RUN \ /defaults/nzbhydra.yml -L \ "https://raw.githubusercontent.com/theotherp/nzbhydra2/v${NZBHYDRA2_VER}/core/src/main/resources/config/baseConfig.yml" && \ sed -i 's/mapIpToHost: true/mapIpToHost: false/' /defaults/nzbhydra.yml && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ diff --git a/Jenkinsfile b/Jenkinsfile index 0dcf76a0..0e35c79e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,8 +34,8 @@ pipeline { CI_PORT='5076' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='/system/about' } stages { @@ -533,7 +533,7 @@ pipeline { --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Nzbhydra2\" \ - --label \"org.opencontainers.image.description=[Nzbhydra2](https://github.com/theotherp/nzbhydra2) is a meta search application for NZB indexers, the spiritual successor to NZBmegasearcH, and an evolution of the original application [NZBHydra](https://github.com/theotherp/nzbhydra). It provides easy access to a number of raw and newznab based indexers. The application NZBHydra 2 is currently in its early stages and is in active development. Be wary that there may be some compatibility issues for those migrating from V1 to V2, so ensure you back up your old configuration before moving over to the new version. \" \ + --label \"org.opencontainers.image.description=[Nzbhydra2](https://github.com/theotherp/nzbhydra2) is a meta search application for NZB indexers, the spiritual successor to NZBmegasearcH, and an evolution of the original application [NZBHydra](https://github.com/theotherp/nzbhydra). It provides easy access to a number of raw and newznab based indexers. \" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." @@ -565,7 +565,7 @@ pipeline { --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Nzbhydra2\" \ - --label \"org.opencontainers.image.description=[Nzbhydra2](https://github.com/theotherp/nzbhydra2) is a meta search application for NZB indexers, the spiritual successor to NZBmegasearcH, and an evolution of the original application [NZBHydra](https://github.com/theotherp/nzbhydra). It provides easy access to a number of raw and newznab based indexers. The application NZBHydra 2 is currently in its early stages and is in active development. Be wary that there may be some compatibility issues for those migrating from V1 to V2, so ensure you back up your old configuration before moving over to the new version. \" \ + --label \"org.opencontainers.image.description=[Nzbhydra2](https://github.com/theotherp/nzbhydra2) is a meta search application for NZB indexers, the spiritual successor to NZBmegasearcH, and an evolution of the original application [NZBHydra](https://github.com/theotherp/nzbhydra). It provides easy access to a number of raw and newznab based indexers. \" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." @@ -594,7 +594,7 @@ pipeline { --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ --label \"org.opencontainers.image.title=Nzbhydra2\" \ - --label \"org.opencontainers.image.description=[Nzbhydra2](https://github.com/theotherp/nzbhydra2) is a meta search application for NZB indexers, the spiritual successor to NZBmegasearcH, and an evolution of the original application [NZBHydra](https://github.com/theotherp/nzbhydra). It provides easy access to a number of raw and newznab based indexers. The application NZBHydra 2 is currently in its early stages and is in active development. Be wary that there may be some compatibility issues for those migrating from V1 to V2, so ensure you back up your old configuration before moving over to the new version. \" \ + --label \"org.opencontainers.image.description=[Nzbhydra2](https://github.com/theotherp/nzbhydra2) is a meta search application for NZB indexers, the spiritual successor to NZBmegasearcH, and an evolution of the original application [NZBHydra](https://github.com/theotherp/nzbhydra). It provides easy access to a number of raw and newznab based indexers. \" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." diff --git a/README.md b/README.md index 38ca2743..1a75408b 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Find us at: [Nzbhydra2](https://github.com/theotherp/nzbhydra2) is a meta search application for NZB indexers, the "spiritual successor" to NZBmegasearcH, and an evolution of the original application [NZBHydra](https://github.com/theotherp/nzbhydra). -It provides easy access to a number of raw and newznab based indexers. The application NZBHydra 2 is currently in its early stages and is in active development. Be wary that there may be some compatibility issues for those migrating from V1 to V2, so ensure you back up your old configuration before moving over to the new version. +It provides easy access to a number of raw and newznab based indexers. [![nzbhydra2](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/hydra-icon.png)](https://github.com/theotherp/nzbhydra2) @@ -70,7 +70,7 @@ This image provides various versions that are available via tags. Please read th ## Application Setup -The web interface is at `:5076` , to set up indexers and connections to your nzb download applications. +The web interface is at `:5076`, to set up indexers and connections to your nzb download applications. ## Usage @@ -89,8 +89,8 @@ services: - PGID=1000 - TZ=Etc/UTC volumes: - - :/config - - :/downloads + - /path/to/nzbhydra2/data:/config + - /path/to/downloads:/downloads #optional ports: - 5076:5076 restart: unless-stopped @@ -105,8 +105,8 @@ docker run -d \ -e PGID=1000 \ -e TZ=Etc/UTC \ -p 5076:5076 \ - -v :/config \ - -v :/downloads \ + -v /path/to/nzbhydra2/data:/config \ + -v /path/to/downloads:/downloads `#optional` \ --restart unless-stopped \ lscr.io/linuxserver/nzbhydra2:dev ``` @@ -121,7 +121,7 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | -| `-v /config` | Where nzbhydra2 should store config files. | +| `-v /config` | Where nzbhydra2 should store config data. | | `-v /downloads` | NZB download folder. | ## Environment variables from files (Docker secrets) @@ -285,6 +285,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **18.07.24:** - Rebase to Ubuntu Noble. Remove standalone JRE. * **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **22.01.23:** - Update release URL for arch-specific packages. * **20.01.23:** - Update dependencies for v5. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 5e559a07..7fe6488e 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -23,8 +23,8 @@ repo_vars: - CI_PORT='5076' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='/system/about' sponsor_links: - { name: "NZBHydra 2", url: "https://github.com/theotherp/nzbhydra2#donate" } diff --git a/readme-vars.yml b/readme-vars.yml index b6839c51..84f5b01b 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -7,9 +7,8 @@ project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/ma project_blurb: | [{{ project_name|capitalize }}]({{ project_url }}) is a meta search application for NZB indexers, the "spiritual successor" to NZBmegasearcH, and an evolution of the original application [NZBHydra](https://github.com/theotherp/nzbhydra). - It provides easy access to a number of raw and newznab based indexers. The application NZBHydra 2 is currently in its early stages and is in active development. Be wary that there may be some compatibility issues for those migrating from V1 to V2, so ensure you back up your old configuration before moving over to the new version. + It provides easy access to a number of raw and newznab based indexers. 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"} @@ -22,32 +21,22 @@ 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: "", desc: "Where nzbhydra2 should store config files."} - - {vol_path: "/downloads", vol_host_path: "", desc: "NZB download folder."} + - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Where nzbhydra2 should store config data."} param_usage_include_ports: true param_ports: - {external_port: "5076", internal_port: "5076", port_desc: "WebUI"} -param_device_map: false -cap_add_param: false -# optional container parameters -opt_param_usage_include_env: false -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 +opt_param_usage_include_vols: true +opt_param_volumes: + - {vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "NZB download folder."} # application setup block app_setup_block_enabled: true app_setup_block: | - The web interface is at `:5076` , to set up indexers and connections to your nzb download applications. + The web interface is at `:5076`, to set up indexers and connections to your nzb download applications. # changelog changelogs: + - {date: "18.07.24:", desc: "Rebase to Ubuntu Noble. Remove standalone JRE."} - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "22.01.23:", desc: "Update release URL for arch-specific packages."} - {date: "20.01.23:", desc: "Update dependencies for v5."} From 1f20f4baa3ed29646dfc7de3a1c1e39f6588496e Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 18 Jul 2024 16:41:51 +0100 Subject: [PATCH 2/2] Add PR link to changelog --- README.md | 2 +- readme-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1a75408b..66784c4c 100644 --- a/README.md +++ b/README.md @@ -285,7 +285,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **18.07.24:** - Rebase to Ubuntu Noble. Remove standalone JRE. +* **18.07.24:** - Rebase to Ubuntu Noble. Remove standalone JRE ([#47](https://github.com/linuxserver/docker-nzbhydra2/pull/47)). * **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **22.01.23:** - Update release URL for arch-specific packages. * **20.01.23:** - Update dependencies for v5. diff --git a/readme-vars.yml b/readme-vars.yml index 84f5b01b..14b32d5e 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -36,7 +36,7 @@ app_setup_block: | The web interface is at `:5076`, to set up indexers and connections to your nzb download applications. # changelog changelogs: - - {date: "18.07.24:", desc: "Rebase to Ubuntu Noble. Remove standalone JRE."} + - {date: "18.07.24:", desc: "Rebase to Ubuntu Noble. Remove standalone JRE ([#47](https://github.com/linuxserver/docker-nzbhydra2/pull/47))."} - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "22.01.23:", desc: "Update release URL for arch-specific packages."} - {date: "20.01.23:", desc: "Update dependencies for v5."}