From 26ac2971b16eb299624087238a20536a1e1d0625 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 10 May 2019 12:48:29 -0700 Subject: [PATCH 1/3] rebase to bionic --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 302c143..04f0b30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/mono:xenial +FROM lsiobase/mono:bionic # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1bf3907..c677316 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/mono:arm64v8-xenial +FROM lsiobase/mono:arm64v8-bionic # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c9fb74e..02f8182 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/mono:arm32v7-xenial +FROM lsiobase/mono:arm32v7-bionic # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index e76aa73..fbd0715 100644 --- a/README.md +++ b/README.md @@ -193,6 +193,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **10.05.19:** - Rebase to Bionic. * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag. * **01.02.19:** - Multi arch images and pipeline build logic * **15.12.17:** - Fix continuation lines. diff --git a/readme-vars.yml b/readme-vars.yml index ccf3fad..e988a7c 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -51,6 +51,7 @@ app_setup_block: | # changelog changelogs: + - { date: "10.05.19:", desc: "Rebase to Bionic." } - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." } - { date: "01.02.19:", desc: "Multi arch images and pipeline build logic" } - { date: "15.12.17:", desc: "Fix continuation lines." } From d0628719f16d02b2d6a6ab007936190e367da906 Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 17 May 2019 16:28:25 -0700 Subject: [PATCH 2/3] adding 5.14 branch based on bionic --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- README.md | 20 ++++++++++---------- readme-vars.yml | 21 +++++++-------------- 5 files changed, 20 insertions(+), 27 deletions(-) diff --git a/Dockerfile b/Dockerfile index 04f0b30..b830cf9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/mono:bionic +FROM lsiobase/mono:bionic-5.14 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c677316..04feca1 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/mono:arm64v8-bionic +FROM lsiobase/mono:arm64v8-bionic-5.14 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 02f8182..928248b 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/mono:arm32v7-bionic +FROM lsiobase/mono:arm32v7-bionic-5.14 # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index fbd0715..c25cc02 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,16 @@ The architectures supported by this image are: | arm64 | arm64v8-latest | | armhf | arm32v7-latest | +## Version Tags + +This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. + +| Tag | Description | +| :----: | --- | +| latest | Stable releases from Sonarr (currently v2) | +| develop | Development releases from Sonarr (currently v2) | +| preview | Preview releases from Sonarr (currently v3) | +| 5.14 | Stable Sonarr releases, but run on Mono 5.14 | ## Usage @@ -62,16 +72,6 @@ docker create \ linuxserver/sonarr ``` -### Version Tags - -This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. - -| Tag | Description | -| :----: | --- | -| latest | stable builds from the master branch of sonarr (currently v2) | -| develop | development builds from the develop branch of sonarr (currently v2) | -| preview | preview builds from the phantom-develop branch of sonarr (currently v3) | - ### docker-compose diff --git a/readme-vars.yml b/readme-vars.yml index e988a7c..8f33c44 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -14,20 +14,13 @@ available_architectures: - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"} -# Optional Block -optional_block_1: true -optional_block_1_items: - - | - ### Version Tags - - This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them. - - | Tag | Description | - | :----: | --- | - | latest | stable builds from the master branch of sonarr (currently v2) | - | develop | development builds from the develop branch of sonarr (currently v2) | - | preview | preview builds from the phantom-develop branch of sonarr (currently v3) | - +# development version +development_versions: true +development_versions_items: + - { tag: "latest", desc: "Stable releases from Sonarr (currently v2)" } + - { tag: "develop", desc: "Development releases from Sonarr (currently v2)" } + - { tag: "preview", desc: "Preview releases from Sonarr (currently v3)" } + - { tag: "5.14", desc: "Stable Sonarr releases, but run on Mono 5.14" } # container parameters param_container_name: "{{ project_name }}" From 5e9073654a6c06e4dcb2e2cd4b817a398a63c9cf Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 17 May 2019 16:41:09 -0700 Subject: [PATCH 3/3] forgot to change branch endpoint for 5.14 --- Jenkinsfile | 68 ++++++++++++++++++++++++------------------------ jenkins-vars.yml | 6 ++--- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a34c8a1..c739ec9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,7 @@ pipeline { script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( - script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', + script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':5.14 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() env.LS_RELEASE_NOTES = sh( script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', @@ -112,10 +112,10 @@ pipeline { } } } - // If this is a master build use live docker endpoints + // If this is a 5.14 build use live docker endpoints stage("Set ENV live build"){ when { - branch "master" + branch "5.14" environment name: 'CHANGE_ID', value: '' } steps { @@ -133,7 +133,7 @@ pipeline { // If this is a dev build use dev docker endpoints stage("Set ENV dev build"){ when { - not {branch "master"} + not {branch "5.14"} environment name: 'CHANGE_ID', value: '' } steps { @@ -200,7 +200,7 @@ pipeline { // Use helper containers to render templated files stage('Update-Templates') { when { - branch "master" + branch "5.14" environment name: 'CHANGE_ID', value: '' expression { env.CONTAINER_NAME != null @@ -211,13 +211,13 @@ pipeline { set -e TEMPDIR=$(mktemp -d) docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=5.14 -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker pull linuxserver/doc-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=5.14 -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ]; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f master + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f 5.14 cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/ cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ cd ${TEMPDIR}/repo/${LS_REPO}/ @@ -248,7 +248,7 @@ pipeline { // Exit the build if the Templated files were just updated stage('Template-exit') { when { - branch "master" + branch "5.14" environment name: 'CHANGE_ID', value: '' environment name: 'FILES_UPDATED', value: 'true' expression { @@ -347,7 +347,7 @@ pipeline { // Take the image we just built and dump package versions for comparison stage('Update-packages') { when { - branch "master" + branch "5.14" environment name: 'CHANGE_ID', value: '' environment name: 'EXIT_STATUS', value: '' } @@ -375,7 +375,7 @@ pipeline { echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO} - git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master + git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f 5.14 cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ cd ${TEMPDIR}/${LS_REPO}/ wait @@ -399,7 +399,7 @@ pipeline { // Exit the build if the package file was just updated stage('PACKAGE-exit') { when { - branch "master" + branch "5.14" environment name: 'CHANGE_ID', value: '' environment name: 'PACKAGE_UPDATED', value: 'true' environment name: 'EXIT_STATUS', value: '' @@ -413,7 +413,7 @@ pipeline { // Exit the build if this is just a package check and there are no changes to push stage('PACKAGECHECK-exit') { when { - branch "master" + branch "5.14" environment name: 'CHANGE_ID', value: '' environment name: 'PACKAGE_UPDATED', value: 'false' environment name: 'EXIT_STATUS', value: '' @@ -497,12 +497,12 @@ pipeline { sh '''#! /bin/bash echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin ''' - sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest" - sh "docker push ${IMAGE}:latest" + sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:5.14" + sh "docker push ${IMAGE}:5.14" sh "docker push ${IMAGE}:${META_TAG}" sh '''docker rmi \ ${IMAGE}:${META_TAG} \ - ${IMAGE}:latest || :''' + ${IMAGE}:5.14 || :''' } } @@ -532,32 +532,32 @@ pipeline { docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi''' - sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-latest" - sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-latest" - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest" + sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-5.14" + sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-5.14" + sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-5.14" sh "docker push ${IMAGE}:amd64-${META_TAG}" sh "docker push ${IMAGE}:arm32v7-${META_TAG}" sh "docker push ${IMAGE}:arm64v8-${META_TAG}" - sh "docker push ${IMAGE}:amd64-latest" - sh "docker push ${IMAGE}:arm32v7-latest" - sh "docker push ${IMAGE}:arm64v8-latest" - sh "docker manifest push --purge ${IMAGE}:latest || :" - sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v7-latest ${IMAGE}:arm64v8-latest" - sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v7-latest --os linux --arch arm" - sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8" + sh "docker push ${IMAGE}:amd64-5.14" + sh "docker push ${IMAGE}:arm32v7-5.14" + sh "docker push ${IMAGE}:arm64v8-5.14" + sh "docker manifest push --purge ${IMAGE}:5.14 || :" + sh "docker manifest create ${IMAGE}:5.14 ${IMAGE}:amd64-5.14 ${IMAGE}:arm32v7-5.14 ${IMAGE}:arm64v8-5.14" + sh "docker manifest annotate ${IMAGE}:5.14 ${IMAGE}:arm32v7-5.14 --os linux --arch arm" + sh "docker manifest annotate ${IMAGE}:5.14 ${IMAGE}:arm64v8-5.14 --os linux --arch arm64 --variant v8" sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :" sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}" sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm" sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8" - sh "docker manifest push --purge ${IMAGE}:latest" + sh "docker manifest push --purge ${IMAGE}:5.14" sh "docker manifest push --purge ${IMAGE}:${META_TAG}" sh '''docker rmi \ ${IMAGE}:amd64-${META_TAG} \ - ${IMAGE}:amd64-latest \ + ${IMAGE}:amd64-5.14 \ ${IMAGE}:arm32v7-${META_TAG} \ - ${IMAGE}:arm32v7-latest \ + ${IMAGE}:arm32v7-5.14 \ ${IMAGE}:arm64v8-${META_TAG} \ - ${IMAGE}:arm64v8-latest \ + ${IMAGE}:arm64v8-5.14 \ lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \ lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :''' } @@ -566,7 +566,7 @@ pipeline { // If this is a public release tag it in the LS Github stage('Github-Tag-Push-Release') { when { - branch "master" + branch "5.14" expression { env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } @@ -578,17 +578,17 @@ pipeline { sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ "object": "'${COMMIT_SHA}'",\ - "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\ + "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to 5.14",\ "type": "commit",\ "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ - "target_commitish": "master",\ + "target_commitish": "5.14",\ "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**Remote Changes:**\\n\\n' > start - printf '","draft": false,"prerelease": false}' >> releasebody.json + printf '","draft": false,"prerelease": true}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index fde9bf4..46e4029 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -4,9 +4,9 @@ project_name: docker-sonarr external_type: na custom_version_command: "curl -sX GET https://services.sonarr.tv/v1/download/master | jq -r '.version'" -release_type: stable -release_tag: latest -ls_branch: master +release_type: prerelease +release_tag: 5.14 +ls_branch: 5.14 repo_vars: - BUILD_VERSION_ARG = 'SONARR_VERSION' - LS_USER = 'linuxserver'