Merge pull request '3.11.6' (#1) from 3.11.6 into master

Reviewed-on: #1

Dockerfile

@@ -0,0 +1,27 @@
+# Base on latest (edge) alpine image
+FROM harbor.ervine.dev/library/x86_64/alpine/alpine-3.11
+
+MAINTAINER “Jonathan Ervine” <docker@ervine.org>
+
+# Install updates
+ENV LANG='en_US.UTF-8' \
+    LANGUAGE='en_US.UTF-8' \
+    TERM='xterm' \
+    VERSION='2.25.0' 
+
+RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
+  apk update && \
+  apk -U upgrade && \
+  apk -U add openjdk11-jre-headless unzip python3
+
+RUN wget https://github.com/theotherp/nzbhydra2/releases/download/v$VERSION/nzbhydra2-$VERSION-linux.zip -O nzbhydra.zip && \
+    mkdir /nzbhydra && \
+    unzip /nzbhydra.zip -d /nzbhydra && \
+    chmod 755 /nzbhydra/nzbhydra2 && \
+    rm -rf /nzbhydra.zip /tmp/src /var/cache/apk/*
+
+EXPOSE 5076
+COPY start.sh /usr/local/bin/start.sh
+VOLUME /config
+
+CMD [ "/usr/local/bin/start.sh" ]

Jenkinsfile

@@ -0,0 +1,36 @@
+
+podTemplate(yaml: """
+kind: Pod
+spec:
+  containers:
+  - name: kaniko
+    image: gcr.io/kaniko-project/executor:debug-539ddefcae3fd6b411a95982a830d987f4214251
+    imagePullPolicy: Always
+    command:
+    - /busybox/cat
+    tty: true
+    volumeMounts:
+      - name: jenkins-docker-cfg
+        mountPath: /kaniko/.docker
+  volumes:
+  - name: jenkins-docker-cfg
+    projected:
+      sources:
+      - secret:
+          name: regcred
+          items:
+            - key: .dockerconfigjson
+              path: config.json
+"""
+  ) {
+
+  node(POD_LABEL) {
+    stage('Build with Kaniko') {
+      git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-nzbhydra.git', credentialsId: 'jenkins-to-git'
+      container('kaniko') {
+        sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=true --destination=harbor.ervine.dev/library/x86_64/alpine/nzbhydra2:2.25.0 --destination=harbor.ervine.dev/library/x86_64/alpine/nzbhydra2:2.25 --destination=harbor.ervine.dev/library/x86_64/alpine/nzbget2:2'
+      }
+    }
+  }
+}
+

README.md

@@ -1,3 +1,4 @@
 # x86_64-alpine-nzbhydra
 
-NZBhydra index searcher running on Alpine Linux container image
+NZBhydra index searcher running on Alpine Linux container image
+- Bumped to version 2

start.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+## Script to kick off NZBHydra2 searcher
+#
+addgroup -g $GID $USER
+adduser -D -u $UID -G $USER -H $USER
+chown -R $UID:$GID /nzbhydra
+su - $USER -c "cd /nzbhydra; /usr/bin/python3 nzbhydra2wrapperPy3.py --nobrowser --datafolder=/config/"