Merge branch 'master' of ssh://git.ervine.org/jonny/x86_64-alpine-nzbhydra

This commit is contained in:
Jon Ervine 2021-04-02 00:34:02 +08:00
commit dc4c20edac
2 changed files with 11 additions and 16 deletions

View File

@ -1,32 +1,27 @@
# Base on latest (edge) alpine image # Base on latest (edge) alpine image
FROM harbor.ervine.dev/public/x86_64/alpine/liberica-openjdk-alpine-musl:14.0.2-x86_64 FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.3
MAINTAINER “Jonathan Ervine” <docker@ervine.org> MAINTAINER “Jonathan Ervine” <docker@ervine.org>
# Install updates # Install updates
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='3.13.0' \
HYDRA_USER=hydra \
MYNAME=jonny \
HYDRA_UID=1027 \
HYDRA_GID=1027
RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
apk update && \ apk update && \
apk -U upgrade --ignore alpine-baselayout && \ apk -U upgrade --ignore alpine-baselayout && \
apk -U add unzip python3 apk -U add unzip python3
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/v3.0.2.4552/nzbhydra2-3.0.2.4552-linux.zip -O hydra.zip && \
mkdir /nzbhydra && \ mkdir /nzbhydra && \
unzip /nzbhydra.zip -d /nzbhydra && \ unzip /hydra.zip -d /nzbhydra && \
chmod 755 /nzbhydra/nzbhydra2 && \ chmod 755 /nzbhydra/nzbhydra2 && \
rm -rf /nzbhydra.zip /tmp/src /var/cache/apk/* && \ rm -rf /hydra.zip /tmp/src /var/cache/apk/* && \
addgroup -g $HYDRA_GID $HYDRA_USER && \ addgroup -g 1027 hydra && \
adduser -D -u $HYDRA_UID -G $HYDRA_USER -H $HYDRA_USER adduser -D -u 1027 -G hydra -H hydra
USER hydra
EXPOSE 5076 EXPOSE 5076
VOLUME /config VOLUME /config
WORKDIR /nzbhydra WORKDIR /nzbhydra

6
Jenkinsfile vendored
View File

@ -4,7 +4,7 @@ kind: Pod
spec: spec:
containers: containers:
- name: kaniko - name: kaniko
image: gcr.io/kaniko-project/executor:debug-539ddefcae3fd6b411a95982a830d987f4214251 image: gcr.io/kaniko-project/executor:debug
imagePullPolicy: Always imagePullPolicy: Always
command: command:
- /busybox/cat - /busybox/cat
@ -28,11 +28,11 @@ spec:
stage('Build with Kaniko') { stage('Build with Kaniko') {
git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-nzbhydra.git', credentialsId: 'jenkins-to-git' git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-nzbhydra.git', credentialsId: 'jenkins-to-git'
container('kaniko') { container('kaniko') {
sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/nzbhydra2:v3.13.0 --destination=harbor.ervine.dev/public/x86_64/alpine/nzbhydra2:v3.13' sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/nzbhydra2:v3.0.2.4552'
} }
} }
stage('Notify gchat') { stage('Notify gchat') {
hangoutsNotify message: "NZBhydra 3.13.0 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false hangoutsNotify message: "NZBhydra 3.0.2.4552 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false
} }
} }
} }