From c2ea0fe475287456efee8d07242aa5c4e55db733 Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 18 Jul 2024 16:18:30 +0100 Subject: [PATCH 1/4] Rebase to noble --- Dockerfile | 7 ++++--- Dockerfile.aarch64 | 7 ++++--- Jenkinsfile | 6 +++--- README.md | 13 +++++++------ readme-vars.yml | 24 +++++++----------------- 5 files changed, 25 insertions(+), 32 deletions(-) diff --git a/Dockerfile b/Dockerfile index 307432fd..51801778 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,8 +10,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="nemchik" # environment settings -ARG DEBIAN_FRONTEND="noninteractive" -ENV NZBHYDRA2_RELEASE_TYPE="Release" +ENV NZBHYDRA2_RELEASE_TYPE="Release" \ + DEBIAN_FRONTEND="noninteractive" RUN \ echo "**** install packages ****" && \ @@ -40,6 +40,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 b4ad80bc..7766aa59 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble # set version label ARG BUILD_DATE @@ -10,8 +10,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="nemchik" # environment settings -ARG DEBIAN_FRONTEND="noninteractive" -ENV NZBHYDRA2_RELEASE_TYPE="Release" +ENV NZBHYDRA2_RELEASE_TYPE="Release" \ + DEBIAN_FRONTEND="noninteractive" RUN \ echo "**** install packages ****" && \ @@ -40,6 +40,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 b5dda02f..207683d6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 replacing NZBHydra 1 and supports migrating from V1. 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. **NOTE:** The last version that supports migration is `linuxserver/nzbhydra2:v2.10.2-ls49` \" \ + --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 replacing NZBHydra 1 and supports migrating from V1. 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. **NOTE:** The last version that supports migration is `linuxserver/nzbhydra2:v2.10.2-ls49` \" \ + --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 replacing NZBHydra 1 and supports migrating from V1. 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. **NOTE:** The last version that supports migration is `linuxserver/nzbhydra2:v2.10.2-ls49` \" \ + --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 2902dd57..b490c69c 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 replacing NZBHydra 1 and supports migrating from V1. 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. **NOTE:** The last version that supports migration is `linuxserver/nzbhydra2:v2.10.2-ls49` +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) @@ -89,8 +89,8 @@ services: - PGID=1000 - TZ=Etc/UTC volumes: - - /path/to/data:/config - - /nzb/download:/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 /path/to/data:/config \ - -v /nzb/download:/downloads \ + -v /path/to/nzbhydra2/data:/config \ + -v /path/to/downloads:/downloads `#optional` \ --restart unless-stopped \ lscr.io/linuxserver/nzbhydra2:latest ``` @@ -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. * **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 ff1f87d3..9666f6f8 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 replacing NZBHydra 1 and supports migrating from V1. 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. **NOTE:** The last version that supports migration is `linuxserver/nzbhydra2:v2.10.2-ls49` + 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,23 @@ 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/data", desc: "Where nzbhydra2 should store config files."} - - {vol_path: "/downloads", vol_host_path: "/nzb/download", 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. # changelog changelogs: + - {date: "18.07.24:", desc: "Rebase to Ubuntu Noble."} - {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 b4aec9dda4be991ee100fa8e9956865b4b784957 Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 18 Jul 2024 16:19:48 +0100 Subject: [PATCH 2/4] Update CI vars --- Jenkinsfile | 4 ++-- jenkins-vars.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 207683d6..b36be224 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 { diff --git a/jenkins-vars.yml b/jenkins-vars.yml index f03b0299..6d04b945 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -24,9 +24,9 @@ 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" } - + From 34c1d1d67fbe2c9ec6fa2731caebce1b2c04e8e8 Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 18 Jul 2024 16:29:57 +0100 Subject: [PATCH 3/4] Remove jre --- Dockerfile | 1 - Dockerfile.aarch64 | 1 - readme-vars.yml | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 51801778..158b28f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,6 @@ RUN \ apt-get update && \ apt-get install --no-install-recommends -y \ libfreetype6 \ - openjdk-17-jre-headless \ python3 \ unzip && \ echo "**** install nzbhydra2 ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 7766aa59..5d6ea338 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -18,7 +18,6 @@ RUN \ apt-get update && \ apt-get install --no-install-recommends -y \ libfreetype6 \ - openjdk-17-jre-headless \ python3 \ unzip && \ echo "**** install nzbhydra2 ****" && \ diff --git a/readme-vars.yml b/readme-vars.yml index 9666f6f8..d6dd3f30 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -37,7 +37,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."} + - {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 07d0df15e664e16e61d99ac64093e90c0a0e96aa Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 18 Jul 2024 16:42:43 +0100 Subject: [PATCH 4/4] 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 b490c69c..861f00de 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. +* **18.07.24:** - Rebase to Ubuntu Noble. Remove standalone JRE ([#46](https://github.com/linuxserver/docker-nzbhydra2/pull/46)). * **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 d6dd3f30..99d8f442 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -37,7 +37,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 ([#46](https://github.com/linuxserver/docker-nzbhydra2/pull/46))."} - {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."}