Bot Updating Package Versions

2020-04-27 16:07:33 +00:00 · 2020-04-23 02:07:41 -04:00 · 2020-04-15 02:50:14 +01:00 · 2020-04-14 20:40:57 -05:00 · 2020-04-14 19:50:39 -04:00 · 2020-04-14 17:17:43 -05:00
13 changed files with 180 additions and 146 deletions
@@ -1 +1,2 @@
 open_collective: linuxserver
+custom: ["https://github.com/theotherp/nzbhydra2#donate",]
@@ -31,4 +31,4 @@ If you are new to Docker or this application our issue tracker is **ONLY** used
 <!--- Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container -->

 ## Docker logs
-<!--- Provide a full docker log, output of "docker logs hydra2" -->
+<!--- Provide a full docker log, output of "docker logs nzbhydra2" -->
@@ -3,9 +3,9 @@ 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="sparklyballs"
+LABEL maintainer="nemchik"

 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
@@ -15,25 +15,26 @@ RUN \
 apt-get update && \
 apt-get install -y \
 	curl \
+	jq \
 	unzip && \
 apt-get install --no-install-recommends -y \
 	openjdk-11-jre-headless \
-	python && \
- echo "**** install hydra2 ****" && \
- if [ -z ${HYDRA2_RELEASE+x} ]; then \
-	HYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
+	python3 && \
+ 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/nzbhydra2wrapper.py -L \
-	"https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapper.py" && \
- chmod +x /app/hydra2/nzbhydra2wrapper.py && \
+ /app/nzbhydra2/nzbhydra2wrapperPy3.py -L \
+	"https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapperPy3.py" && \
+ chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
 echo "**** cleanup ****" && \
 rm -rf \
 	/tmp/* \
@@ -45,4 +46,4 @@ COPY root/ /

 # ports and volumes
 EXPOSE 5076
-VOLUME /config /downloads
+VOLUME /config
@@ -3,9 +3,9 @@ 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="sparklyballs"
+LABEL maintainer="nemchik"

 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
@@ -15,25 +15,26 @@ RUN \
 apt-get update && \
 apt-get install -y \
 	curl \
+	jq \
 	unzip && \
 apt-get install --no-install-recommends -y \
 	openjdk-11-jre-headless \
-	python && \
- echo "**** install hydra2 ****" && \
- if [ -z ${HYDRA2_RELEASE+x} ]; then \
-	HYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
+	python3 && \
+ 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/nzbhydra2wrapper.py -L \
-	"https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapper.py" && \
- chmod +x /app/hydra2/nzbhydra2wrapper.py && \
+ /app/nzbhydra2/nzbhydra2wrapperPy3.py -L \
+	"https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapperPy3.py" && \
+ chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
 echo "**** cleanup ****" && \
 rm -rf \
 	/tmp/* \
@@ -45,4 +46,4 @@ COPY root/ /

 # ports and volumes
 EXPOSE 5076
-VOLUME /config /downloads
+VOLUME /config
@@ -3,9 +3,9 @@ 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="sparklyballs"
+LABEL maintainer="nemchik"

 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"
@@ -15,25 +15,26 @@ RUN \
 apt-get update && \
 apt-get install -y \
 	curl \
+	jq \
 	unzip && \
 apt-get install --no-install-recommends -y \
 	openjdk-11-jre-headless \
-	python && \
- echo "**** install hydra2 ****" && \
- if [ -z ${HYDRA2_RELEASE+x} ]; then \
-	HYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases/latest" \
-	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
+	python3 && \
+ 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/nzbhydra2wrapper.py -L \
-	"https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapper.py" && \
- chmod +x /app/hydra2/nzbhydra2wrapper.py && \
+ /app/nzbhydra2/nzbhydra2wrapperPy3.py -L \
+	"https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapperPy3.py" && \
+ chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
 echo "**** cleanup ****" && \
 rm -rf \
 	/tmp/* \
@@ -45,4 +46,4 @@ COPY root/ /

 # ports and volumes
 EXPOSE 5076
-VOLUME /config /downloads
+VOLUME /config
@@ -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'
@@ -58,7 +58,7 @@ pipeline {
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
          env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE.md ./.github/PULL_REQUEST_TEMPLATE.md ./root/donate.txt'
        }
        script{
          env.LS_RELEASE_NUMBER = sh(
@@ -7,7 +7,7 @@
 [![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.")
 [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")

-The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring :-
+The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:

 * regular and timely application updates
 * easy user mappings (PGID, PUID)
@@ -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 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. 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:

@@ -57,6 +57,14 @@ The architectures supported by this image are:
 | arm64 | arm64v8-latest |
 | armhf | arm32v7-latest |

+## Version Tags
+
+This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
+
+| Tag | Description |
+| :----: | --- |
+| latest | Stable releases |
+| dev | Prereleases from their GitHub |

 ## Usage

@@ -66,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 \
@@ -74,7 +82,7 @@ docker create \
  -v <path to data>:/config \
  -v <nzb download>:/downloads \
  --restart unless-stopped \
-  linuxserver/hydra2
+  linuxserver/nzbhydra2
 ```


@@ -84,11 +92,11 @@ Compatible with docker-compose v2 schemas.

 ```
 ---
-version: "2"
+version: "2.1"
 services:
-  hydra2:
-    image: linuxserver/hydra2
-    container_name: hydra2
+  nzbhydra2:
+    image: linuxserver/nzbhydra2
+    container_name: nzbhydra2
    environment:
      - PUID=1000
      - PGID=1000
@@ -111,7 +119,7 @@ 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)
@@ -146,15 +154,20 @@ In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as bel
 The web interface is at `<your ip>:5076` , to set up indexers and connections to your nzb download applications.


+## Docker Mods
+[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27nzbhydra2%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=nzbhydra2 "view available mods for this container.")
+
+We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above.
+

 ## 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

@@ -163,18 +176,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)
@@ -183,7 +196,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.
@@ -194,12 +207,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`
@@ -211,6 +224,9 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **14.04.20:** - Correct Name, Hydra2 -> NZBHydra2.
+* **08.01.20:** - Switch to python3.
+* **05.01.20:** - Add dev tag for prereleases.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
 * **11.02.19:** - Add pipeline logic and multi arch.
 * **18.08.18:** - Bump java version to 10, (bionic currently refers to it as version 11).
@@ -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'
@@ -27,3 +27,6 @@ repo_vars:
  - CI_DOCKERENV='TZ=US/Pacific'
  - CI_AUTH='user:password'
  - CI_WEBPATH=''
+sponsor_links:
+  - { name: "NZBHydra 2", url: "https://github.com/theotherp/nzbhydra2#donate" }
+  
@@ -1,10 +1,10 @@
 adduser3.116ubuntu1
 apt1.6.12
 apt-utils1.6.12
-base-files10.1ubuntu2.7
+base-files10.1ubuntu2.8
 base-passwd3.5.44
 bash4.4.18-2ubuntu1.2
-bsdutils1:2.31.1-0.4ubuntu3.4
+bsdutils1:2.31.1-0.4ubuntu3.6
 bzip21.0.6-8.1ubuntu0.2
 ca-certificates20180409
 ca-certificates-java20180516ubuntu1~18.04.1
@@ -15,53 +15,54 @@ debconf1.5.66ubuntu1
 debianutils4.8.4
 diffutils1:3.6-1
 dpkg1.19.0.5ubuntu2.3
-e2fsprogs1.44.1-1ubuntu1.2
-fdisk2.31.1-0.4ubuntu3.4
+e2fsprogs1.44.1-1ubuntu1.3
+fdisk2.31.1-0.4ubuntu3.6
 findutils4.6.0+git+20170828-2
 fontconfig-config2.12.6-0ubuntu2
 fonts-dejavu-core2.37-1
-gcc-8-base8.3.0-6ubuntu1~18.04.1
+gcc-8-base8.4.0-1ubuntu1~18.04
 gpgv2.2.4-1ubuntu1.2
 grep3.1-2build1
 gzip1.6-5ubuntu1
 hostname3.20
 init-system-helpers1.51
 java-common0.68ubuntu1~18.04.1
+jq1.5+dfsg-2
 krb5-locales1.16-2ubuntu0.1
 libacl12.2.52-3build1
 libapt-inst2.01.6.12
 libapt-pkg5.01.6.12
 libasn1-8-heimdal7.5.0+dfsg-1
-libasound21.1.3-5ubuntu0.2
-libasound2-data1.1.3-5ubuntu0.2
+libasound21.1.3-5ubuntu0.5
+libasound2-data1.1.3-5ubuntu0.5
 libattr11:2.4.47-2build1
 libaudit11:2.8.2-1ubuntu1
 libaudit-common1:2.8.2-1ubuntu1
 libavahi-client30.7-3.1ubuntu1.2
 libavahi-common30.7-3.1ubuntu1.2
 libavahi-common-data0.7-3.1ubuntu1.2
-libblkid12.31.1-0.4ubuntu3.4
-libbsd00.8.7-1
+libblkid12.31.1-0.4ubuntu3.6
+libbsd00.8.7-1ubuntu0.1
 libbz2-1.01.0.6-8.1ubuntu0.2
 libc62.27-3ubuntu1
 libcap-ng00.7.7-3.1
 libc-bin2.27-3ubuntu1
-libcom-err21.44.1-1ubuntu1.2
-libcups22.2.7-1ubuntu2.7
+libcom-err21.44.1-1ubuntu1.3
+libcups22.2.7-1ubuntu2.8
 libcurl47.58.0-2ubuntu3.8
 libdb5.35.3.28-13.1ubuntu1.1
 libdbus-1-31.12.2-1ubuntu1.1
 libdebconfclient00.213ubuntu1
 libexpat12.2.5-3ubuntu0.2
-libext2fs21.44.1-1ubuntu1.2
-libfdisk12.31.1-0.4ubuntu3.4
+libext2fs21.44.1-1ubuntu1.3
+libfdisk12.31.1-0.4ubuntu3.6
 libffi63.2.1-8
 libfontconfig12.12.6-0ubuntu2
 libfreetype62.8.1-2ubuntu2
-libgcc11:8.3.0-6ubuntu1~18.04.1
-libgcrypt201.8.1-4ubuntu1.1
+libgcc11:8.4.0-1ubuntu1~18.04
+libgcrypt201.8.1-4ubuntu1.2
 libgmp102:6.1.2+dfsg-2
-libgnutls303.5.18-1ubuntu1.1
+libgnutls303.5.18-1ubuntu1.3
 libgpg-error01.27-6
 libgssapi3-heimdal7.5.0+dfsg-1
 libgssapi-krb5-21.16-2ubuntu0.1
@@ -73,6 +74,7 @@ libhx509-5-heimdal7.5.0+dfsg-1
 libidn2-02.0.4-1.1ubuntu0.2
 libjpeg88c-2ubuntu8
 libjpeg-turbo81.5.2-0ubuntu5.18.04.3
+libjq11.5+dfsg-2
 libk5crypto31.16-2ubuntu0.1
 libkeyutils11.5.9-9.2ubuntu2
 libkrb5-26-heimdal7.5.0+dfsg-1
@@ -83,13 +85,15 @@ libldap-2.4-22.4.45+dfsg-1ubuntu1.4
 libldap-common2.4.45+dfsg-1ubuntu1.4
 liblz4-10.0~r131-2ubuntu3
 liblzma55.2.2-1.3
-libmount12.31.1-0.4ubuntu3.4
+libmount12.31.1-0.4ubuntu3.6
+libmpdec22.4.2-1ubuntu1
 libncurses56.1-1ubuntu1.18.04
 libncursesw56.1-1ubuntu1.18.04
 libnettle63.4-1
 libnghttp2-141.30.0-1ubuntu1
 libnspr42:4.18-1ubuntu1
-libnss32:3.35-2ubuntu2.6
+libnss32:3.35-2ubuntu2.7
+libonig46.7.0-1
 libp11-kit00.23.9-2
 libpam0g1.1.8-3.6ubuntu2.18.04.1
 libpam-modules1.1.8-3.6ubuntu2.18.04.1
@@ -100,31 +104,31 @@ libpcsclite11.8.23-1
 libpng16-161.6.34-1ubuntu0.18.04.2
 libprocps62:3.3.12-3ubuntu1.2
 libpsl50.19.1-5build1
-libpython2.7-minimal2.7.17-1~18.04
-libpython2.7-stdlib2.7.17-1~18.04
-libpython-stdlib2.7.15~rc1-1
+libpython3.6-minimal3.6.9-1~18.04ubuntu1
+libpython3.6-stdlib3.6.9-1~18.04ubuntu1
+libpython3-stdlib3.6.7-1~18.04
 libreadline77.0-3
 libroken18-heimdal7.5.0+dfsg-1
 librtmp12.4+20151223.gitfa8646d.1-1
-libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2
-libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2
-libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2
+libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2.1
+libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2.1
+libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2.1
 libseccomp22.4.1-0ubuntu0.18.04.2
 libselinux12.7-2build2
 libsemanage12.7-2build2
 libsemanage-common2.7-2build2
 libsepol12.7-1
-libsmartcols12.31.1-0.4ubuntu3.4
-libsqlite3-03.22.0-1ubuntu0.2
-libss21.44.1-1ubuntu1.2
+libsmartcols12.31.1-0.4ubuntu3.6
+libsqlite3-03.22.0-1ubuntu0.3
+libss21.44.1-1ubuntu1.3
 libssl1.11.1.1-1ubuntu2.1~18.04.5
-libstdc++68.3.0-6ubuntu1~18.04.1
-libsystemd0237-3ubuntu10.33
+libstdc++68.4.0-1ubuntu1~18.04
+libsystemd0237-3ubuntu10.39
 libtasn1-64.13-2
 libtinfo56.1-1ubuntu1.18.04
-libudev1237-3ubuntu10.33
+libudev1237-3ubuntu10.39
 libunistring20.9.9-0ubuntu2
-libuuid12.31.1-0.4ubuntu3.4
+libuuid12.31.1-0.4ubuntu3.6
 libwind0-heimdal7.5.0+dfsg-1
 libx11-62:1.6.4-3ubuntu0.2
 libx11-data2:1.6.4-3ubuntu0.2
@@ -141,20 +145,20 @@ login1:4.5-1ubuntu2
 lsb-base9.20170808ubuntu1
 mawk1.3.3-17ubuntu3
 mime-support3.60ubuntu1
-mount2.31.1-0.4ubuntu3.4
+mount2.31.1-0.4ubuntu3.6
 multiarch-support2.27-3ubuntu1
 ncurses-base6.1-1ubuntu1.18.04
 ncurses-bin6.1-1ubuntu1.18.04
-openjdk-11-jre-headless11.0.5+10-0ubuntu1.1~18.04
+openjdk-11-jre-headless11.0.7+10-2ubuntu2~18.04
 openssl1.1.1-1ubuntu2.1~18.04.5
 passwd1:4.5-1ubuntu2
 perl-base5.26.1-6ubuntu0.3
 procps2:3.3.12-3ubuntu1.2
 publicsuffix20180223.1310-1
-python2.7.15~rc1-1
-python2.72.7.17-1~18.04
-python2.7-minimal2.7.17-1~18.04
-python-minimal2.7.15~rc1-1
+python33.6.7-1~18.04
+python3.63.6.9-1~18.04ubuntu1
+python3.6-minimal3.6.9-1~18.04ubuntu1
+python3-minimal3.6.7-1~18.04
 readline-common7.0-3
 sed4.4-2
 sensible-utils0.0.12
@@ -164,6 +168,6 @@ tzdata2019c-0ubuntu0.18.04
 ubuntu-keyring2018.09.18.1~18.04.0
 ucf3.0038
 unzip6.0-21ubuntu1
-util-linux2.31.1-0.4ubuntu3.4
+util-linux2.31.1-0.4ubuntu3.6
 x11-common1:7.7+19ubuntu7.1
 zlib1g1:1.2.11.dfsg-0ubuntu2
@@ -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 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. 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

@@ -18,7 +18,10 @@ available_architectures:
  - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}

 # development version
-development_versions: false
+development_versions: true
+development_versions_items:
+  - { tag: "latest", desc: "Stable releases" }
+  - { tag: "dev", desc: "Prereleases from their GitHub" }

 # container parameters
 common_param_env_vars_enabled: true
@@ -29,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: "<path to data>", desc: "Where hydra2 should store config files." }
+  - { 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." }
 param_usage_include_ports: true
 param_ports:
@@ -53,6 +56,9 @@ app_setup_block: |
 # changelog

 changelogs:
+  - { date: "14.04.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." }
  - { date: "11.02.19:", desc: "Add pipeline logic and multi arch." }
  - { date: "18.08.18:", desc: "Bump java version to 10, (bionic currently refers to it as version 11)." }
@@ -0,0 +1 @@
+NZBHydra 2: https://github.com/theotherp/nzbhydra2#donate
@@ -5,5 +5,5 @@ mkdir -p /config/logs


 # permissions
-chmod +x /app/hydra2/nzbhydra2
+chmod +x /app/nzbhydra2/nzbhydra2
 chown -R abc:abc /config
@@ -3,8 +3,8 @@
 # unset unraid specific ENV to avoid crashing
 unset HOST_OS

-cd /app/hydra2 || exit
+cd /app/nzbhydra2 || exit

 exec \
-	s6-setuidgid abc /usr/bin/python nzbhydra2wrapper.py \
+	s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py \
 	--nobrowser --datafolder /config
Author	SHA1	Message	Date
LinuxServer-CI	6265517e19	Bot Updating Package Versions	2020-04-27 16:07:33 +00:00
LinuxServer-CI	7f13e9c443	Bot Updating Package Versions	2020-04-23 02:07:41 -04:00
LinuxServer-CI	d926aee5e3	Bot Updating Package Versions	2020-04-15 02:50:14 +01:00
Eric NemchikandGitHub	5ac25f7d08	Merge pull request #1 from linuxserver/nzbhydra2 Correct Name	2020-04-14 20:40:57 -05:00
aptalcaandGitHub	3286b4d1fc	Merge branch 'master' into nzbhydra2	2020-04-14 19:50:39 -04:00
Eric Nemchik	f92bbc6011	Update changelog date	2020-04-14 17:17:43 -05:00
Eric Nemchik	7aeb6a3e34	Jenkins updates	2020-04-14 14:36:02 -05:00
LinuxServer-CI	421e722315	Bot Updating Templated Files	2020-04-14 14:42:02 -04:00
LinuxServer-CI	3c1cdfbb66	Bot Updating Templated Files	2020-04-14 14:40:57 -04:00
aptalcaandGitHub	98893cebc9	Merge pull request #34 from linuxserver/donate Add donate link	2020-04-14 14:40:00 -04:00
Eric NemchikandGitHub	f4b889dc7c	Add donate link	2020-04-14 13:08:55 -05:00
LinuxServer-CI	b612cd22f0	Bot Updating Package Versions	2020-04-10 05:51:30 -05:00
LinuxServer-CI	053b1ba5a8	Bot Updating Templated Files	2020-04-10 10:46:04 +00:00
LinuxServer-CI	ef3efdc5bc	Bot Updating Package Versions	2020-03-27 11:58:27 +00:00
LinuxServer-CI	55a4c014f3	Bot Updating Package Versions	2020-03-20 12:49:29 +01:00
LinuxServer-CI	6add88a07a	Bot Updating Package Versions	2020-03-13 13:02:45 +01:00
LinuxServer-CI	d79b2c963a	Bot Updating Package Versions	2020-02-19 18:26:02 +00:00
LinuxServer-CI	6de658a24b	Bot Updating Package Versions	2020-02-12 12:49:34 -05:00
Eric Nemchik	c514b9c7ff	Correct Name	2020-02-12 11:22:33 -06:00
LinuxServer-CI	6e73b38915	Bot Updating Package Versions	2020-02-06 15:13:37 +00:00
LinuxServer-CI	8fb719df38	Bot Updating Package Versions	2020-01-31 11:49:42 +00:00
LinuxServer-CI	f7951c52ef	Bot Updating Package Versions	2020-01-24 06:50:48 -05:00
LinuxServer-CI	27f878f932	Bot Updating Package Versions	2020-01-20 12:10:37 -05:00
LinuxServer-CI	87041b87f8	Bot Updating Templated Files	2020-01-20 12:04:29 -05:00
RoxedusandRyan Kuba	1281cb7048	Update readme-vars.yml Remove beta state of the application. Added migration note based on @iXNyNe's comment in the discord server discordapp.com/channels/354974912613449730/506925392603512839/664936745862823987	2020-01-20 09:02:52 -08:00
LinuxServer-CI	d59e06317d	Bot Updating Package Versions	2020-01-15 16:22:27 -05:00
LinuxServer-CI	5df31b5700	Bot Updating Package Versions	2020-01-12 19:26:36 +00:00
LinuxServer-CI	fcb52a9093	Bot Updating Templated Files	2020-01-12 20:16:51 +01:00
Eric NemchikandRyan Kuba	501d213242	Use nzbhydra2wrapperPy3.py	2020-01-12 11:15:51 -08:00
Eric NemchikandRyan Kuba	d659263231	switch to python3	2020-01-12 11:15:51 -08:00
LinuxServer-CI	b34e11688a	Bot Updating Package Versions	2020-01-10 11:50:18 +00:00
saargandGitHub	dbf0b36f49	Merge pull request #27 from linuxserver/readme Add dev tag	2020-01-07 00:06:22 +01:00
aptalca	476d98f2e3	Add dev tag	2020-01-05 11:40:07 -05:00
				`@@ -0,0 +1 @@`
				`NZBHydra 2: https://github.com/theotherp/nzbhydra2#donate`