From 5fd5bd7d9882528625aa62a29575415b89d70cb4 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Wed, 19 Feb 2020 06:21:10 +0000 Subject: [PATCH 01/13] new file: Dockerfile new file: Jenkinsfile Initial commit --- Dockerfile | 39 +++++++++++++++++++++++++++++++++++++++ Jenkinsfile | 17 +++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 Dockerfile create mode 100644 Jenkinsfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..91a6d88 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,39 @@ +# Base on latest (edge) alpine image +FROM harbor.ervine.dev/library/x86_64/alpine/alpine-3.11 + +MAINTAINER “Jonathan Ervine” + +# Install updates +ENV LANG='en_US.UTF-8' \ + LANGUAGE='en_US.UTF-8' \ + TERM='xterm' \ + VERSION='develop' \ + SONARR_USER='mediaservice' \ + SONARR_GROUP='mediaservice' \ + SONARR_UID='1003' \ + SONARR_GID='1003' + +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 \ + && \ + apk del make gcc g++ && \ + rm -rf /tmp/src && \ + rm -rf /var/cache/apk/* + +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 /NzbDrone + +EXPOSE 8989 + +USER $SONARR_USER + +CMD [ "/usr/bin/mono", "--debug", "/NzbDrone/NzbDrone.exe", "/nobrowser", "/data=/config" ] diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..46c888f --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,17 @@ +node("docker-node") { + docker.withRegistry('https://harbor.ervine.dev', 'jenkins-to-harbor') { + + git branch: "3.11.3", url: "ssh://git@git.ervine.org:2222/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() + println commit_id + + stage "build" + def app = docker.build "library/x86_64/alpine/sonarr" + + stage "publish" + app.push("${env.BUILD_NUMBER}") + app.push("latest") + } +} From d12204cc5da944ae7088dd46376eadd8c55e303b Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Sat, 14 Mar 2020 14:36:48 +0000 Subject: [PATCH 02/13] modified: Jenkinsfile Added k8s deploy command to build --- Jenkinsfile | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 46c888f..cf256b6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,12 +6,22 @@ node("docker-node") { sh "git rev-parse HEAD > .git/commit-id" def commit_id = readFile('.git/commit-id').trim() println commit_id + + try { + stage "build" + def app = docker.build "library/x86_64/alpine/sonarr" - stage "build" - def app = docker.build "library/x86_64/alpine/sonarr" - - stage "publish" - app.push("${env.BUILD_NUMBER}") - app.push("latest") + stage "publish" + app.push("${env.BUILD_NUMBER}") + app.push("v2.0.0.5322") + app.push("latest") + + stage('Deploy on K8s'){ + sh "/usr/local/bin/kubectl -n media delete po sonarr-0" + } + } + catch (err) { + currentBuild.result = 'FAILURE' + } } } From 017a8714b3b787a3d859e32c4756fbd625de322a Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Mon, 16 Mar 2020 14:18:15 +0000 Subject: [PATCH 03/13] modified: Dockerfile new file: start.sh Added startup script for sonarr --- Dockerfile | 5 ++++- start.sh | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 start.sh diff --git a/Dockerfile b/Dockerfile index 91a6d88..b2828cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,6 +25,9 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie rm -rf /tmp/src && \ rm -rf /var/cache/apk/* +ADD start.sh /usr/loca/bin/start.sh +RUN chmod 755 /usr/local/bin/start.sh + 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 && \ @@ -36,4 +39,4 @@ EXPOSE 8989 USER $SONARR_USER -CMD [ "/usr/bin/mono", "--debug", "/NzbDrone/NzbDrone.exe", "/nobrowser", "/data=/config" ] +CMD [ "/usr/local/bin/start.sh" ] diff --git a/start.sh b/start.sh new file mode 100644 index 0000000..46225f9 --- /dev/null +++ b/start.sh @@ -0,0 +1,6 @@ +#!/bin/sh +## +## Script to start the sonarr server +## +until [ -f "/config/sonarr.db" ]; do sleep 1; done +/usr/bin/mono --debug /NzbDrone/NzbDrone.exe /nobrowser /data=/config From b3d90b47ca52c3dc0bef8a64a773a115ed967a43 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Mon, 16 Mar 2020 14:19:31 +0000 Subject: [PATCH 04/13] modified: Dockerfile Fixed typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b2828cf..235a58f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,7 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie rm -rf /tmp/src && \ rm -rf /var/cache/apk/* -ADD start.sh /usr/loca/bin/start.sh +ADD start.sh /usr/local/bin/start.sh RUN chmod 755 /usr/local/bin/start.sh RUN wget https://update.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -O nzbdrone.tar.gz && \ From 842a1a5b763a6ef0416968be1a00f82140549120 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Mon, 16 Mar 2020 14:26:30 +0000 Subject: [PATCH 05/13] modified: start.sh Fixed wrong database name --- start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.sh b/start.sh index 46225f9..f609ecf 100644 --- a/start.sh +++ b/start.sh @@ -2,5 +2,5 @@ ## ## Script to start the sonarr server ## -until [ -f "/config/sonarr.db" ]; do sleep 1; done +until [ -f "/config/Nzbdrone.db" ]; do sleep 1; done /usr/bin/mono --debug /NzbDrone/NzbDrone.exe /nobrowser /data=/config From 2fd93f7b8c8df893723a249ed47a8f18e29b39fc Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Mon, 16 Mar 2020 14:33:34 +0000 Subject: [PATCH 06/13] modified: start.sh Removed capitlisation of nzbdrone db name --- start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.sh b/start.sh index f609ecf..0d77a31 100644 --- a/start.sh +++ b/start.sh @@ -2,5 +2,5 @@ ## ## Script to start the sonarr server ## -until [ -f "/config/Nzbdrone.db" ]; do sleep 1; done +until [ -f "/config/nzbdrone.db" ]; do sleep 1; done /usr/bin/mono --debug /NzbDrone/NzbDrone.exe /nobrowser /data=/config From ea40dc65f40dddbdc054b661836f8963a4fd906c Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Tue, 31 Mar 2020 14:39:14 +0800 Subject: [PATCH 07/13] modified: Dockerfile modified: Jenkinsfile modified: start.sh --- Dockerfile | 14 +++++--------- Jenkinsfile | 2 +- start.sh | 4 ++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 235a58f..766427f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,11 +16,7 @@ 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 \ - && \ + apk -U add libmediainfo ca-certificates mono curl && \ apk del make gcc g++ && \ rm -rf /tmp/src && \ rm -rf /var/cache/apk/* @@ -28,12 +24,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 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 && \ +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 && \ addgroup -g $SONARR_GID $SONARR_GROUP && \ adduser -D -u $SONARR_UID -G $SONARR_GROUP -H $SONARR_USER && \ - chown -R $SONARR_USER:$SONARR_GROUP /NzbDrone + chown -R $SONARR_USER:$SONARR_GROUP /Sonarr EXPOSE 8989 diff --git a/Jenkinsfile b/Jenkinsfile index cf256b6..d2d33d6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ node("docker-node") { stage "publish" app.push("${env.BUILD_NUMBER}") - app.push("v2.0.0.5322") + app.push("v3.0.3.748") app.push("latest") stage('Deploy on K8s'){ diff --git a/start.sh b/start.sh index 0d77a31..bede7a8 100644 --- a/start.sh +++ b/start.sh @@ -2,5 +2,5 @@ ## ## Script to start the sonarr server ## -until [ -f "/config/nzbdrone.db" ]; do sleep 1; done -/usr/bin/mono --debug /NzbDrone/NzbDrone.exe /nobrowser /data=/config +until [ -f "/config/sonarr.db" ]; do sleep 1; done +/usr/bin/mono --debug /Sonarr/Sonarr.exe --nobrowser --data=/config From ee9767c8428e5dd5c1a7fe5ed261d5c1d4d28cf7 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Tue, 31 Mar 2020 14:39:51 +0800 Subject: [PATCH 08/13] modified: Jenkinsfile UPdated to delete sonarr3 pod --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d2d33d6..65ba82c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ node("docker-node") { app.push("latest") stage('Deploy on K8s'){ - sh "/usr/local/bin/kubectl -n media delete po sonarr-0" + sh "/usr/local/bin/kubectl -n media delete po sonarr3-0" } } catch (err) { From 338a29a682226096477871a31a03d9ed0136a88b Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Tue, 31 Mar 2020 14:40:55 +0800 Subject: [PATCH 09/13] modified: Jenkinsfile Removed docker latest tags --- Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 65ba82c..3ec0c0d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,9 +12,7 @@ node("docker-node") { def app = docker.build "library/x86_64/alpine/sonarr" stage "publish" - app.push("${env.BUILD_NUMBER}") app.push("v3.0.3.748") - app.push("latest") stage('Deploy on K8s'){ sh "/usr/local/bin/kubectl -n media delete po sonarr3-0" From ee11dd0ffb85e98401e2886505eaf4310a30a25d Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Tue, 31 Mar 2020 14:54:56 +0800 Subject: [PATCH 10/13] modified: Jenkinsfile Added v3 tag --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3ec0c0d..d236770 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ node("docker-node") { docker.withRegistry('https://harbor.ervine.dev', 'jenkins-to-harbor') { - git branch: "3.11.3", url: "ssh://git@git.ervine.org:2222/jonny/x86_64-alpine-sonarr", credentialsId: 'jenkins-to-git' + git branch: "v3-dev", url: "ssh://git@git.ervine.org:2222/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() @@ -13,6 +13,7 @@ node("docker-node") { stage "publish" app.push("v3.0.3.748") + app.push("v3") stage('Deploy on K8s'){ sh "/usr/local/bin/kubectl -n media delete po sonarr3-0" From b6ced93554538d412f4d6f040f61c0cf022076e5 Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Fri, 5 Jun 2020 15:23:05 +0800 Subject: [PATCH 11/13] modified: Dockerfile modified: Jenkinsfile --- Dockerfile | 14 +++++++++----- Jenkinsfile | 8 ++++---- 2 files changed, 13 insertions(+), 9 deletions(-) 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) { From 5e00189cbec3cef1f5c2c5e5f904359e6f74224f Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Sun, 7 Jun 2020 22:46:02 +0800 Subject: [PATCH 12/13] modified: start.sh Fix for Sonarr 2 --- start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/start.sh b/start.sh index bede7a8..8806c2b 100644 --- a/start.sh +++ b/start.sh @@ -2,5 +2,5 @@ ## ## Script to start the sonarr server ## -until [ -f "/config/sonarr.db" ]; do sleep 1; done -/usr/bin/mono --debug /Sonarr/Sonarr.exe --nobrowser --data=/config +until [ -f "/config/nzbdrone.db" ]; do sleep 1; done +/usr/bin/mono --debug /Sonarr/NzbDrone.exe --nobrowser --data=/config From 6491806a2f81829cc8b799fb2c253b4b5fa7a51c Mon Sep 17 00:00:00 2001 From: Jonathan Ervine Date: Mon, 8 Jun 2020 00:09:11 +0800 Subject: [PATCH 13/13] modified: start.sh --- start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.sh b/start.sh index 8806c2b..d3cad1f 100644 --- a/start.sh +++ b/start.sh @@ -3,4 +3,4 @@ ## Script to start the sonarr server ## until [ -f "/config/nzbdrone.db" ]; do sleep 1; done -/usr/bin/mono --debug /Sonarr/NzbDrone.exe --nobrowser --data=/config +/usr/bin/mono --debug /NzbDrone/NzbDrone.exe --nobrowser --data=/config