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

This commit is contained in:
Jon Ervine 2021-04-01 21:41:25 +08:00
commit 3980b951c0
2 changed files with 10 additions and 17 deletions

View File

@ -1,16 +1,12 @@
# Base on latest (edge) alpine image
FROM harbor.ervine.dev/public/x86_64/alpine:v3.13
FROM harbor.ervine.dev/public/x86_64/alpine:v3.13.3:v3.13.3
LABEL maintainer="Jonathan Ervine <docker@ervine.org>"
# Install updates
ENV LANG='en_US.UTF-8' \
LANGUAGE='en_US.UTF-8' \
TERM='xterm' \
VERSION='2.6.6' \
TAUT_USER='tautulli' \
TAUT_UID=1027 \
TAUT_GID=1027
TERM='xterm'
RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
apk update && \
@ -20,16 +16,12 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie
ADD UTC /etc/localtime
#RUN git clone https://github.com/Tautulli/Tautulli && \
RUN wget https://github.com/Tautulli/Tautulli/archive/v$VERSION.tar.gz && \
tar zxvf v$VERSION.tar.gz -C / && \
mv /Tautulli-$VERSION /Tautulli && \
RUN wget https://github.com/Tautulli/Tautulli/archive/v2.6.10.tar.gz && \
tar zxvf v2.6.10.tar.gz -C / && \
mv /Tautulli-2.6.10 /Tautulli && \
rm *.tar.gz && \
rm -rf /var/cache/apk/* && \
addgroup -g $TAUT_GID $TAUT_USER && \
adduser -D -u $TAUT_UID -G $TAUT_USER -H $TAUT_USER
EXPOSE 8181
USER $TAUT_USER
addgroup -g 1027 tautulli && \
adduser -D -u 1027 -G tautulli -H tautulli
CMD [ "/usr/bin/python3", "/Tautulli/Tautulli.py", "--datadir", "/config", "--nofork", "--nolaunch" ]

5
Jenkinsfile vendored
View File

@ -1,3 +1,4 @@
podTemplate(yaml: """
kind: Pod
spec:
@ -27,11 +28,11 @@ spec:
stage('Build with Kaniko') {
git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-tautulli.git', credentialsId: 'jenkins-to-git'
container('kaniko') {
sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/tautulli:v2.6.6 --destination=harbor.ervine.dev/public/x86_64/alpine/tautulli:v2.6'
sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/tautulli:v2.6.10-3.13.3'
}
}
stage('Notify gchat') {
hangoutsNotify message: "Tautulli 2.6.6 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false
hangoutsNotify message: "Tatutulli 2.6.10 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false
}
}
}