modified: Dockerfile

modified:   Jenkinsfile
Bumped to 2.17.2 and removed some RUN commands to reduce image layers
This commit is contained in:
Jonathan Ervine 2020-04-01 17:34:24 +08:00
parent d9202e7eb7
commit 8a01100020
2 changed files with 11 additions and 12 deletions

View File

@ -7,7 +7,7 @@ MAINTAINER “Jonathan Ervine” <docker@ervine.org>
ENV LANG='en_US.UTF-8' \ ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \
TERM='xterm' \ TERM='xterm' \
VERSION='2.17.1' \ VERSION='2.17.2' \
MED_USER='mediaservice' \ MED_USER='mediaservice' \
MED_GROUP='mediaservice' \ MED_GROUP='mediaservice' \
MED_UID='1003' \ 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 upgrade && \
apk -U add openjdk11-jre-headless unzip python3 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 wget https://github.com/theotherp/nzbhydra2/releases/download/v$VERSION/nzbhydra2-$VERSION-linux.zip -O nzbhydra.zip mkdir /nzbhydra && \
RUN mkdir /nzbhydra unzip /nzbhydra.zip -d /nzbhydra && \
RUN unzip /nzbhydra.zip -d /nzbhydra chmod 755 /nzbhydra/nzbhydra2 && \
RUN chmod 755 /nzbhydra/nzbhydra2 rm -rf /nzbhydra.zip && \
RUN rm -rf /nzbhydra.zip rm -rf /tmp/src && \
RUN rm -rf /tmp/src rm -rf /var/cache/apk/* && \
RUN rm -rf /var/cache/apk/* RUN addgroup -g $MED_GID $MED_GROUP && \
RUN addgroup -g $MED_GID $MED_GROUP adduser -D -u $MED_UID -G $MED_GROUP -H $MED_USER
RUN adduser -D -u $MED_UID -G $MED_GROUP -H $MED_USER
RUN chown -R $MED_USER:$MED_GROUP /nzbhydra RUN chown -R $MED_USER:$MED_GROUP /nzbhydra
EXPOSE 5076 EXPOSE 5076

2
Jenkinsfile vendored
View File

@ -13,7 +13,7 @@ node("docker-node") {
stage "publish" stage "publish"
app.push("${env.BUILD_NUMBER}") app.push("${env.BUILD_NUMBER}")
app.push("2.17.1") app.push("2.17.2")
app.push("2") app.push("2")
app.push("latest") app.push("latest")