Bot Updating Package Versions

Add dev tag

Dockerfile

@@ -5,7 +5,7 @@ ARG BUILD_DATE
 ARG VERSION
 ARG HYDRA2_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,14 +15,15 @@ RUN \
  apt-get update && \
  apt-get install -y \
 	curl \
+	jq \
 	unzip && \
  apt-get install --no-install-recommends -y \
 	openjdk-11-jre-headless \
-	python && \
+	python3 && \
  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='[""]'); \
+	| jq -r .tag_name); \
  fi && \
  HYDRA2_VER=${HYDRA2_RELEASE#v} && \
  curl -o \
@@ -31,9 +32,9 @@ RUN \
  mkdir -p /app/hydra2 && \
  unzip /tmp/hydra2.zip -d /app/hydra2 && \
  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/hydra2/nzbhydra2wrapperPy3.py -L \
+	"https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapperPy3.py" && \
+ chmod +x /app/hydra2/nzbhydra2wrapperPy3.py && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/* \
@@ -45,4 +46,4 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 5076
-VOLUME /config /downloads
+VOLUME /config

Dockerfile.aarch64

@@ -5,7 +5,7 @@ ARG BUILD_DATE
 ARG VERSION
 ARG HYDRA2_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,14 +15,15 @@ RUN \
  apt-get update && \
  apt-get install -y \
 	curl \
+	jq \
 	unzip && \
  apt-get install --no-install-recommends -y \
 	openjdk-11-jre-headless \
-	python && \
+	python3 && \
  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='[""]'); \
+	| jq -r .tag_name); \
  fi && \
  HYDRA2_VER=${HYDRA2_RELEASE#v} && \
  curl -o \
@@ -31,9 +32,9 @@ RUN \
  mkdir -p /app/hydra2 && \
  unzip /tmp/hydra2.zip -d /app/hydra2 && \
  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/hydra2/nzbhydra2wrapperPy3.py -L \
+	"https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapperPy3.py" && \
+ chmod +x /app/hydra2/nzbhydra2wrapperPy3.py && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/* \
@@ -45,4 +46,4 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 5076
-VOLUME /config /downloads
+VOLUME /config

Dockerfile.armhf

@@ -5,7 +5,7 @@ ARG BUILD_DATE
 ARG VERSION
 ARG HYDRA2_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,14 +15,15 @@ RUN \
  apt-get update && \
  apt-get install -y \
 	curl \
+	jq \
 	unzip && \
  apt-get install --no-install-recommends -y \
 	openjdk-11-jre-headless \
-	python && \
+	python3 && \
  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='[""]'); \
+	| jq -r .tag_name); \
  fi && \
  HYDRA2_VER=${HYDRA2_RELEASE#v} && \
  curl -o \
@@ -31,9 +32,9 @@ RUN \
  mkdir -p /app/hydra2 && \
  unzip /tmp/hydra2.zip -d /app/hydra2 && \
  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/hydra2/nzbhydra2wrapperPy3.py -L \
+	"https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapperPy3.py" && \
+ chmod +x /app/hydra2/nzbhydra2wrapperPy3.py && \
  echo "**** cleanup ****" && \
  rm -rf \
 	/tmp/* \
@@ -45,4 +46,4 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 5076
-VOLUME /config /downloads
+VOLUME /config

README.md

@@ -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
 
@@ -211,6 +219,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **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).

package_versions.txt

@@ -27,6 +27,7 @@ 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
@@ -61,7 +62,7 @@ libfreetype62.8.1-2ubuntu2
 libgcc11:8.3.0-6ubuntu1~18.04.1
 libgcrypt201.8.1-4ubuntu1.1
 libgmp102:6.1.2+dfsg-2
-libgnutls303.5.18-1ubuntu1.1
+libgnutls303.5.18-1ubuntu1.2
 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
@@ -84,12 +86,14 @@ libldap-common2.4.45+dfsg-1ubuntu1.4
 liblz4-10.0~r131-2ubuntu3
 liblzma55.2.2-1.3
 libmount12.31.1-0.4ubuntu3.4
+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,9 +104,9 @@ 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.04
+libpython3.6-stdlib3.6.9-1~18.04
+libpython3-stdlib3.6.7-1~18.04
 libreadline77.0-3
 libroken18-heimdal7.5.0+dfsg-1
 librtmp12.4+20151223.gitfa8646d.1-1
@@ -151,10 +155,10 @@ 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.04
+python3.6-minimal3.6.9-1~18.04
+python3-minimal3.6.7-1~18.04
 readline-common7.0-3
 sed4.4-2
 sensible-utils0.0.12

readme-vars.yml

@@ -6,7 +6,7 @@ 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.
 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
@@ -53,6 +56,8 @@ app_setup_block: |
 # changelog
 
 changelogs:
+  - { 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)." }

root/etc/services.d/nzbhydra2/run

@@ -6,5 +6,5 @@ unset HOST_OS
 cd /app/hydra2 || exit
 
 exec \
-	s6-setuidgid abc /usr/bin/python nzbhydra2wrapper.py \
+	s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py \
 	--nobrowser --datafolder /config