From c514b9c7ffe46d3f48ba341c700229e59a14ecc6 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Wed, 12 Feb 2020 11:19:29 -0600 Subject: [PATCH] Correct Name --- .github/ISSUE_TEMPLATE.md | 8 ++-- Dockerfile | 22 +++++----- Dockerfile.aarch64 | 22 +++++----- Dockerfile.armhf | 22 +++++----- Jenkinsfile | 18 ++++---- README.md | 72 +++++++++++++++---------------- jenkins-vars.yml | 14 +++--- readme-vars.yml | 7 +-- root/etc/cont-init.d/30-config | 2 +- root/etc/services.d/nzbhydra2/run | 2 +- 10 files changed, 95 insertions(+), 94 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 7c4b1e6..2fbc872 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -22,13 +22,13 @@ If you are new to Docker or this application our issue tracker is **ONLY** used 4. ## Environment -**OS:** -**CPU architecture:** x86_64/arm32/arm64 -**How docker service was installed:** +**OS:** +**CPU architecture:** x86_64/arm32/arm64 +**How docker service was installed:** ## Command used to create docker container (run/create/compose/screenshot) ## Docker logs - + diff --git a/Dockerfile b/Dockerfile index 9a8c965..c05508d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM lsiobase/ubuntu:bionic # set version label ARG BUILD_DATE ARG VERSION -ARG HYDRA2_RELEASE +ARG NZBHYDRA2_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="nemchik" @@ -20,21 +20,21 @@ RUN \ apt-get install --no-install-recommends -y \ openjdk-11-jre-headless \ python3 && \ - echo "**** install hydra2 ****" && \ - if [ -z ${HYDRA2_RELEASE+x} ]; then \ - HYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases/latest" \ + echo "**** install nzbhydra2 ****" && \ + if [ -z ${NZBHYDRA2_RELEASE+x} ]; then \ + NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases/latest" \ | jq -r .tag_name); \ fi && \ - HYDRA2_VER=${HYDRA2_RELEASE#v} && \ + NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \ curl -o \ - /tmp/hydra2.zip -L \ - "https://github.com/theotherp/nzbhydra2/releases/download/v${HYDRA2_VER}/nzbhydra2-${HYDRA2_VER}-linux.zip" && \ - mkdir -p /app/hydra2 && \ - unzip /tmp/hydra2.zip -d /app/hydra2 && \ + /tmp/nzbhydra2.zip -L \ + "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \ + mkdir -p /app/nzbhydra2 && \ + unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \ curl -o \ - /app/hydra2/nzbhydra2wrapperPy3.py -L \ + /app/nzbhydra2/nzbhydra2wrapperPy3.py -L \ "https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapperPy3.py" && \ - chmod +x /app/hydra2/nzbhydra2wrapperPy3.py && \ + chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d3fe2ab..1ab438c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -3,7 +3,7 @@ FROM lsiobase/ubuntu:arm64v8-bionic # set version label ARG BUILD_DATE ARG VERSION -ARG HYDRA2_RELEASE +ARG NZBHYDRA2_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="nemchik" @@ -20,21 +20,21 @@ RUN \ apt-get install --no-install-recommends -y \ openjdk-11-jre-headless \ python3 && \ - echo "**** install hydra2 ****" && \ - if [ -z ${HYDRA2_RELEASE+x} ]; then \ - HYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases/latest" \ + echo "**** install nzbhydra2 ****" && \ + if [ -z ${NZBHYDRA2_RELEASE+x} ]; then \ + NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases/latest" \ | jq -r .tag_name); \ fi && \ - HYDRA2_VER=${HYDRA2_RELEASE#v} && \ + NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \ curl -o \ - /tmp/hydra2.zip -L \ - "https://github.com/theotherp/nzbhydra2/releases/download/v${HYDRA2_VER}/nzbhydra2-${HYDRA2_VER}-linux.zip" && \ - mkdir -p /app/hydra2 && \ - unzip /tmp/hydra2.zip -d /app/hydra2 && \ + /tmp/nzbhydra2.zip -L \ + "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \ + mkdir -p /app/nzbhydra2 && \ + unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \ curl -o \ - /app/hydra2/nzbhydra2wrapperPy3.py -L \ + /app/nzbhydra2/nzbhydra2wrapperPy3.py -L \ "https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapperPy3.py" && \ - chmod +x /app/hydra2/nzbhydra2wrapperPy3.py && \ + chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 87eca41..56d1141 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -3,7 +3,7 @@ FROM lsiobase/ubuntu:arm32v7-bionic # set version label ARG BUILD_DATE ARG VERSION -ARG HYDRA2_RELEASE +ARG NZBHYDRA2_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="nemchik" @@ -20,21 +20,21 @@ RUN \ apt-get install --no-install-recommends -y \ openjdk-11-jre-headless \ python3 && \ - echo "**** install hydra2 ****" && \ - if [ -z ${HYDRA2_RELEASE+x} ]; then \ - HYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases/latest" \ + echo "**** install nzbhydra2 ****" && \ + if [ -z ${NZBHYDRA2_RELEASE+x} ]; then \ + NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases/latest" \ | jq -r .tag_name); \ fi && \ - HYDRA2_VER=${HYDRA2_RELEASE#v} && \ + NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \ curl -o \ - /tmp/hydra2.zip -L \ - "https://github.com/theotherp/nzbhydra2/releases/download/v${HYDRA2_VER}/nzbhydra2-${HYDRA2_VER}-linux.zip" && \ - mkdir -p /app/hydra2 && \ - unzip /tmp/hydra2.zip -d /app/hydra2 && \ + /tmp/nzbhydra2.zip -L \ + "https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \ + mkdir -p /app/nzbhydra2 && \ + unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \ curl -o \ - /app/hydra2/nzbhydra2wrapperPy3.py -L \ + /app/nzbhydra2/nzbhydra2wrapperPy3.py -L \ "https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapperPy3.py" && \ - chmod +x /app/hydra2/nzbhydra2wrapperPy3.py && \ + chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ diff --git a/Jenkinsfile b/Jenkinsfile index 2dd086b..1b2f1fd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,13 +19,13 @@ pipeline { EXT_GIT_BRANCH = 'master' EXT_USER = 'theotherp' EXT_REPO = 'nzbhydra2' - BUILD_VERSION_ARG = 'HYDRA2_RELEASE' + BUILD_VERSION_ARG = 'NZBHYDRA2_RELEASE' LS_USER = 'linuxserver' - LS_REPO = 'docker-hydra2' - CONTAINER_NAME = 'hydra2' - DOCKERHUB_IMAGE = 'linuxserver/hydra2' - DEV_DOCKERHUB_IMAGE = 'lsiodev/hydra2' - PR_DOCKERHUB_IMAGE = 'lspipepr/hydra2' + LS_REPO = 'docker-nzbhydra2' + CONTAINER_NAME = 'nzbhydra2' + DOCKERHUB_IMAGE = 'linuxserver/nzbhydra2' + DEV_DOCKERHUB_IMAGE = 'lsiodev/nzbhydra2' + PR_DOCKERHUB_IMAGE = 'lspipepr/nzbhydra2' DIST_IMAGE = 'ubuntu' MULTIARCH='true' CI='true' @@ -237,7 +237,7 @@ pipeline { set -e TEMPDIR=$(mktemp -d) docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) @@ -308,7 +308,7 @@ pipeline { "merge_requests_access_level":"disabled",\ "repository_access_level":"enabled",\ "visibility":"public"}' ''' - } + } } /* ############### Build Container @@ -625,7 +625,7 @@ pipeline { docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 docker manifest push --purge ${MANIFESTIMAGE}:latest - docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} + docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} done for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG} diff --git a/README.md b/README.md index 75cd29d..a935822 100644 --- a/README.md +++ b/README.md @@ -23,31 +23,31 @@ Find us at: * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories. * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget -# [linuxserver/hydra2](https://github.com/linuxserver/docker-hydra2) +# [linuxserver/nzbhydra2](https://github.com/linuxserver/docker-nzbhydra2) -[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-hydra2.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-hydra2) -[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-hydra2.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-hydra2/releases) -[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-hydra2/packages) -[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-hydra2/container_registry) -[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/hydra2) -[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/hydra2.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/hydra2 "Get your own version badge on microbadger.com") -[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/hydra2.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/hydra2) -[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/hydra2.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/hydra2) -[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-hydra2/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-hydra2/job/master/) -[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/hydra2/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/hydra2/latest/index.html) +[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-nzbhydra2.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-nzbhydra2) +[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-nzbhydra2.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-nzbhydra2/releases) +[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-nzbhydra2/packages) +[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-nzbhydra2/container_registry) +[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/nzbhydra2) +[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/nzbhydra2.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/nzbhydra2 "Get your own version badge on microbadger.com") +[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/nzbhydra2.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/nzbhydra2) +[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/nzbhydra2.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/nzbhydra2) +[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-nzbhydra2/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nzbhydra2/job/master/) +[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/nzbhydra2/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/nzbhydra2/latest/index.html) -[Hydra2](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). +[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/hydra2:v2.10.2-ls49` +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` -[![hydra2](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/hydra-icon.png)](https://github.com/theotherp/nzbhydra2) +[![nzbhydra2](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/hydra-icon.png)](https://github.com/theotherp/nzbhydra2) ## Supported Architectures Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). -Simply pulling `linuxserver/hydra2` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. +Simply pulling `linuxserver/nzbhydra2` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. The architectures supported by this image are: @@ -74,7 +74,7 @@ Here are some example snippets to help you get started creating a container. ``` docker create \ - --name=hydra2 \ + --name=nzbhydra2 \ -e PUID=1000 \ -e PGID=1000 \ -e TZ=Europe/London \ @@ -82,7 +82,7 @@ docker create \ -v :/config \ -v :/downloads \ --restart unless-stopped \ - linuxserver/hydra2 + linuxserver/nzbhydra2 ``` @@ -94,9 +94,9 @@ Compatible with docker-compose v2 schemas. --- version: "2" services: - hydra2: - image: linuxserver/hydra2 - container_name: hydra2 + nzbhydra2: + image: linuxserver/nzbhydra2 + container_name: nzbhydra2 environment: - PUID=1000 - PGID=1000 @@ -119,12 +119,12 @@ Container images are configured using parameters passed at runtime (such as thos | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London. | -| `-v /config` | Where hydra2 should store config files. | +| `-v /config` | Where nzbhydra2 should store config files. | | `-v /downloads` | NZB download folder. | ## Environment variables from files (Docker secrets) -You can set any environment variable from a file by using a special prepend `FILE__`. +You can set any environment variable from a file by using a special prepend `FILE__`. As an example: @@ -157,12 +157,12 @@ The web interface is at `:5076` , to set up indexers and connections to ## Support Info -* Shell access whilst the container is running: `docker exec -it hydra2 /bin/bash` -* To monitor the logs of the container in realtime: `docker logs -f hydra2` +* Shell access whilst the container is running: `docker exec -it nzbhydra2 /bin/bash` +* To monitor the logs of the container in realtime: `docker logs -f nzbhydra2` * container version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' hydra2` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' nzbhydra2` * image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/hydra2` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/nzbhydra2` ## Updating Info @@ -171,18 +171,18 @@ Most of our images are static, versioned, and require an image update and contai Below are the instructions for updating containers: ### Via Docker Run/Create -* Update the image: `docker pull linuxserver/hydra2` -* Stop the running container: `docker stop hydra2` -* Delete the container: `docker rm hydra2` +* Update the image: `docker pull linuxserver/nzbhydra2` +* Stop the running container: `docker stop nzbhydra2` +* Delete the container: `docker rm nzbhydra2` * Recreate a new container with the same docker create parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) -* Start the new container: `docker start hydra2` +* Start the new container: `docker start nzbhydra2` * You can also remove the old dangling images: `docker image prune` ### Via Docker Compose * Update all images: `docker-compose pull` - * or update a single image: `docker-compose pull hydra2` + * or update a single image: `docker-compose pull nzbhydra2` * Let compose update all containers as necessary: `docker-compose up -d` - * or update a single container: `docker-compose up -d hydra2` + * or update a single container: `docker-compose up -d nzbhydra2` * You can also remove the old dangling images: `docker image prune` ### Via Watchtower auto-updater (especially useful if you don't remember the original parameters) @@ -191,7 +191,7 @@ Below are the instructions for updating containers: docker run --rm \ -v /var/run/docker.sock:/var/run/docker.sock \ containrrr/watchtower \ - --run-once hydra2 + --run-once nzbhydra2 ``` **Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using Docker Compose. @@ -202,12 +202,12 @@ Below are the instructions for updating containers: If you want to make local modifications to these images for development purposes or just to customize the logic: ``` -git clone https://github.com/linuxserver/docker-hydra2.git -cd docker-hydra2 +git clone https://github.com/linuxserver/docker-nzbhydra2.git +cd docker-nzbhydra2 docker build \ --no-cache \ --pull \ - -t linuxserver/hydra2:latest . + -t linuxserver/nzbhydra2:latest . ``` The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 3631de3..ccfb168 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -1,7 +1,7 @@ --- # jenkins variables -project_name: docker-hydra2 +project_name: docker-nzbhydra2 external_type: github_stable release_type: stable release_tag: latest @@ -10,13 +10,13 @@ repo_vars: - EXT_GIT_BRANCH = 'master' - EXT_USER = 'theotherp' - EXT_REPO = 'nzbhydra2' - - BUILD_VERSION_ARG = 'HYDRA2_RELEASE' + - BUILD_VERSION_ARG = 'NZBHYDRA2_RELEASE' - LS_USER = 'linuxserver' - - LS_REPO = 'docker-hydra2' - - CONTAINER_NAME = 'hydra2' - - DOCKERHUB_IMAGE = 'linuxserver/hydra2' - - DEV_DOCKERHUB_IMAGE = 'lsiodev/hydra2' - - PR_DOCKERHUB_IMAGE = 'lspipepr/hydra2' + - LS_REPO = 'docker-nzbhydra2' + - CONTAINER_NAME = 'nzbhydra2' + - DOCKERHUB_IMAGE = 'linuxserver/nzbhydra2' + - DEV_DOCKERHUB_IMAGE = 'lsiodev/nzbhydra2' + - PR_DOCKERHUB_IMAGE = 'lspipepr/nzbhydra2' - DIST_IMAGE = 'ubuntu' - MULTIARCH='true' - CI='true' diff --git a/readme-vars.yml b/readme-vars.yml index 5678365..a7b144f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -1,13 +1,13 @@ --- # project information -project_name: hydra2 +project_name: nzbhydra2 project_url: "https://github.com/theotherp/nzbhydra2" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/hydra-icon.png" 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/hydra2:v2.10.2-ls49` + 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` project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" project_blurb_optional_extras_enabled: false @@ -32,7 +32,7 @@ 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 hydra2 should store config files." } + - { vol_path: "/config", vol_host_path: "", desc: "Where nzbhydra2 should store config files." } - { vol_path: "/downloads", vol_host_path: "", desc: "NZB download folder." } param_usage_include_ports: true param_ports: @@ -56,6 +56,7 @@ app_setup_block: | # changelog changelogs: + - { date: "12.02.20:", desc: "Correct Name, Hydra2 -> NZBHydra2." } - { date: "08.01.20:", desc: "Switch to python3." } - { date: "05.01.20:", desc: "Add dev tag for prereleases." } - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config index a6cece2..b5e6163 100644 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/cont-init.d/30-config @@ -5,5 +5,5 @@ mkdir -p /config/logs # permissions -chmod +x /app/hydra2/nzbhydra2 +chmod +x /app/nzbhydra2/nzbhydra2 chown -R abc:abc /config diff --git a/root/etc/services.d/nzbhydra2/run b/root/etc/services.d/nzbhydra2/run index b78c7be..a56303e 100644 --- a/root/etc/services.d/nzbhydra2/run +++ b/root/etc/services.d/nzbhydra2/run @@ -3,7 +3,7 @@ # unset unraid specific ENV to avoid crashing unset HOST_OS -cd /app/hydra2 || exit +cd /app/nzbhydra2 || exit exec \ s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py \