From 8a011000203a5041608e6cf60fafa3a29c14462b Mon Sep 17 00:00:00 2001
From: Jonathan Ervine <jonny@olympus.ipa.champion>
Date: Wed, 1 Apr 2020 17:34:24 +0800
Subject: [PATCH] 	modified:   Dockerfile 	modified:   Jenkinsfile Bumped
 to 2.17.2 and removed some RUN commands to reduce image layers

---
 Dockerfile  | 21 ++++++++++-----------
 Jenkinsfile |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8a91c0e..e9aed10 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” <docker@ervine.org>
 ENV LANG='en_US.UTF-8' \
     LANGUAGE='en_US.UTF-8' \
     TERM='xterm' \
-    VERSION='2.17.1' \
+    VERSION='2.17.2' \
     MED_USER='mediaservice' \
     MED_GROUP='mediaservice' \
     MED_UID='1003' \
@@ -18,16 +18,15 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie
   apk -U upgrade && \
   apk -U add openjdk11-jre-headless unzip python3
 
-RUN echo $VERSION
-RUN wget https://github.com/theotherp/nzbhydra2/releases/download/v$VERSION/nzbhydra2-$VERSION-linux.zip -O nzbhydra.zip
-RUN mkdir /nzbhydra
-RUN unzip /nzbhydra.zip -d /nzbhydra
-RUN chmod 755 /nzbhydra/nzbhydra2
-RUN rm -rf /nzbhydra.zip
-RUN rm -rf /tmp/src
-RUN rm -rf /var/cache/apk/*
-RUN addgroup -g $MED_GID $MED_GROUP
-RUN adduser -D -u $MED_UID -G $MED_GROUP -H $MED_USER
+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 && \
+    rm -rf /tmp/src && \
+    rm -rf /var/cache/apk/* && \
+RUN addgroup -g $MED_GID $MED_GROUP && \
+    adduser -D -u $MED_UID -G $MED_GROUP -H $MED_USER
 RUN chown -R $MED_USER:$MED_GROUP /nzbhydra
 
 EXPOSE 5076
diff --git a/Jenkinsfile b/Jenkinsfile
index 8052734..231d1d7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ node("docker-node") {
     
             stage "publish"
             app.push("${env.BUILD_NUMBER}")
-            app.push("2.17.1")
+            app.push("2.17.2")
             app.push("2")
             app.push("latest")