diff --git a/Dockerfile b/Dockerfile index 766427f..235a58f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,11 @@ ENV LANG='en_US.UTF-8' \ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ apk -U update && \ apk -U upgrade && \ - apk -U add libmediainfo ca-certificates mono curl && \ + apk -U add \ + libmediainfo \ + ca-certificates \ + mono \ + && \ apk del make gcc g++ && \ rm -rf /tmp/src && \ rm -rf /var/cache/apk/* @@ -24,12 +28,12 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie ADD start.sh /usr/local/bin/start.sh RUN chmod 755 /usr/local/bin/start.sh -RUN curl -o sonarr.tar.gz https://download.sonarr.tv/v3/phantom-develop/3.0.3.748/Sonarr.phantom-develop.3.0.3.748.linux.tar.gz -o sonarr.tar.gz && \ - tar zxvf sonarr.tar.gz && \ - rm -rf sonarr.tar.gz && \ +RUN wget https://update.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -O nzbdrone.tar.gz && \ + tar zxvf nzbdrone.tar.gz && \ + rm -rf nzbdrone.tar.gz && \ addgroup -g $SONARR_GID $SONARR_GROUP && \ adduser -D -u $SONARR_UID -G $SONARR_GROUP -H $SONARR_USER && \ - chown -R $SONARR_USER:$SONARR_GROUP /Sonarr + chown -R $SONARR_USER:$SONARR_GROUP /NzbDrone EXPOSE 8989 diff --git a/Jenkinsfile b/Jenkinsfile index d236770..e135f57 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ node("docker-node") { docker.withRegistry('https://harbor.ervine.dev', 'jenkins-to-harbor') { - git branch: "v3-dev", url: "ssh://git@git.ervine.org:2222/jonny/x86_64-alpine-sonarr", credentialsId: 'jenkins-to-git' + git branch: "3.11.6", url: "ssh://git@git.ervine.org/jonny/x86_64-alpine-sonarr", credentialsId: 'jenkins-to-git' sh "git rev-parse HEAD > .git/commit-id" def commit_id = readFile('.git/commit-id').trim() @@ -12,11 +12,11 @@ node("docker-node") { def app = docker.build "library/x86_64/alpine/sonarr" stage "publish" - app.push("v3.0.3.748") - app.push("v3") + app.push("v2.0.0.5344") + app.push("v2") stage('Deploy on K8s'){ - sh "/usr/local/bin/kubectl -n media delete po sonarr3-0" + sh "/usr/local/bin/kubectl -n media delete po sonarr-0" } } catch (err) {