From 7bd9d98f63faef8fd4b4e2d1163769a91435ff63 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sat, 28 Nov 2020 23:33:19 -0500 Subject: [PATCH] switch to v3netcore, rebase to focal, add triggers --- .github/workflows/external_trigger.yml | 90 +++++++++++++++++++ .../workflows/external_trigger_scheduler.yml | 43 +++++++++ .github/workflows/package_trigger.yml | 38 ++++++++ .../workflows/package_trigger_scheduler.yml | 50 +++++++++++ Dockerfile | 37 ++++---- Dockerfile.aarch64 | 37 ++++---- Dockerfile.armhf | 37 ++++---- Jenkinsfile | 22 ++--- README.md | 2 +- jenkins-vars.yml | 6 +- readme-vars.yml | 2 +- 11 files changed, 291 insertions(+), 73 deletions(-) create mode 100644 .github/workflows/external_trigger.yml create mode 100644 .github/workflows/external_trigger_scheduler.yml create mode 100644 .github/workflows/package_trigger.yml create mode 100644 .github/workflows/package_trigger_scheduler.yml diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml new file mode 100644 index 0000000..7c5633b --- /dev/null +++ b/.github/workflows/external_trigger.yml @@ -0,0 +1,90 @@ +name: External Trigger Main + +on: + workflow_dispatch: + +jobs: + external-trigger-master: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + + - name: External Trigger + if: github.ref == 'refs/heads/master' + run: | + if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_RADARR_MASTER }}" ]; then + echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_RADARR_MASTER is set; skipping trigger. ****" + exit 0 + fi + echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_RADARR_MASTER\". ****" + echo "**** Retrieving external version ****" + EXT_RELEASE=$(curl -sL https://radarr.servarr.com/v1/update/master/changes?os=linux | jq -r '.[0].version') + if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then + echo "**** Can't retrieve external version, exiting ****" + FAILURE_REASON="Can't retrieve external version for radarr branch master" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + exit 1 + fi + echo "**** External version: ${EXT_RELEASE} ****" + echo "**** Retrieving last pushed version ****" + image="linuxserver/radarr" + tag="latest" + token=$(curl -sX GET \ + "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fradarr%3Apull" \ + | jq -r '.token') + multidigest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${tag}" \ + | jq -r 'first(.manifests[].digest)') + digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ + | jq -r '.config.digest') + image_info=$(curl -sL \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/blobs/${digest}" \ + | jq -r '.container_config') + IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}') + IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}') + if [ -z "${IMAGE_VERSION}" ]; then + echo "**** Can't retrieve last pushed version, exiting ****" + FAILURE_REASON="Can't retrieve last pushed version for radarr tag latest" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680, + "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + exit 1 + fi + echo "**** Last pushed version: ${IMAGE_VERSION} ****" + if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then + echo "**** Version ${EXT_RELEASE} already pushed, exiting ****" + exit 0 + elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-radarr/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****" + exit 0 + else + echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****" + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-radarr/job/master/buildWithParameters?PACKAGE_CHECK=false \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "**** Jenkins job queue url: ${response%$'\r'} ****" + echo "**** Sleeping 10 seconds until job starts ****" + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "**** Jenkins job build url: ${buildurl} ****" + echo "**** Attempting to change the Jenkins job description ****" + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" + echo "**** Notifying Discord ****" + TRIGGER_REASON="A version change was detected for radarr tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + fi diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml new file mode 100644 index 0000000..4b4e3f7 --- /dev/null +++ b/.github/workflows/external_trigger_scheduler.yml @@ -0,0 +1,43 @@ +name: External Trigger Scheduler + +on: + schedule: + - cron: '51 * * * *' + workflow_dispatch: + +jobs: + external-trigger-scheduler: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + with: + fetch-depth: '0' + + - name: External Trigger Scheduler + run: | + echo "**** Branches found: ****" + git for-each-ref --format='%(refname:short)' refs/remotes + echo "**** Pulling the yq docker image ****" + docker pull ghcr.io/linuxserver/yq + for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + do + br=$(echo "$br" | sed 's|origin/||g') + echo "**** Evaluating branch ${br} ****" + ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-radarr/${br}/jenkins-vars.yml \ + | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) + if [ "$br" == "$ls_branch" ]; then + echo "**** Branch ${br} appears to be live; checking workflow. ****" + if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-radarr/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then + echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****." + curl -iX POST \ + -H "Authorization: token ${{ secrets.CR_PAT }}" \ + -H "Accept: application/vnd.github.v3+json" \ + -d "{\"ref\":\"refs/heads/${br}\"}" \ + https://api.github.com/repos/linuxserver/docker-radarr/actions/workflows/external_trigger.yml/dispatches + else + echo "**** Workflow doesn't exist; skipping trigger. ****" + fi + else + echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + fi + done diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml new file mode 100644 index 0000000..a3159d6 --- /dev/null +++ b/.github/workflows/package_trigger.yml @@ -0,0 +1,38 @@ +name: Package Trigger Main + +on: + workflow_dispatch: + +jobs: + package-trigger-master: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + + - name: Package Trigger + if: github.ref == 'refs/heads/master' + run: | + if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_RADARR_MASTER }}" ]; then + echo "**** Github secret PAUSE_PACKAGE_TRIGGER_RADARR_MASTER is set; skipping trigger. ****" + exit 0 + fi + if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-radarr/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" + exit 0 + fi + echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_RADARR_MASTER\". ****" + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-radarr/job/master/buildWithParameters?PACKAGE_CHECK=true \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "**** Jenkins job queue url: ${response%$'\r'} ****" + echo "**** Sleeping 10 seconds until job starts ****" + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "**** Jenkins job build url: ${buildurl} ****" + echo "**** Attempting to change the Jenkins job description ****" + curl -iX POST \ + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml new file mode 100644 index 0000000..ee4af48 --- /dev/null +++ b/.github/workflows/package_trigger_scheduler.yml @@ -0,0 +1,50 @@ +name: Package Trigger Scheduler + +on: + schedule: + - cron: '32 3 * * 3' + workflow_dispatch: + +jobs: + package-trigger-scheduler: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2.3.3 + with: + fetch-depth: '0' + + - name: Package Trigger Scheduler + run: | + echo "**** Branches found: ****" + git for-each-ref --format='%(refname:short)' refs/remotes + echo "**** Pulling the yq docker image ****" + docker pull ghcr.io/linuxserver/yq + for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + do + br=$(echo "$br" | sed 's|origin/||g') + echo "**** Evaluating branch ${br} ****" + ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-radarr/${br}/jenkins-vars.yml \ + | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch) + if [ "${br}" == "${ls_branch}" ]; then + echo "**** Branch ${br} appears to be live; checking workflow. ****" + if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-radarr/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then + echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" + triggered_branches="${triggered_branches}${br} " + curl -iX POST \ + -H "Authorization: token ${{ secrets.CR_PAT }}" \ + -H "Accept: application/vnd.github.v3+json" \ + -d "{\"ref\":\"refs/heads/${br}\"}" \ + https://api.github.com/repos/linuxserver/docker-radarr/actions/workflows/package_trigger.yml/dispatches + sleep 30 + else + echo "**** Workflow doesn't exist; skipping trigger. ****" + fi + else + echo "**** ${br} appears to be a dev branch; skipping trigger. ****" + fi + done + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" + echo "**** Notifying Discord ****" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Package Check Build(s) Triggered for radarr** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-radarr/activity/"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} diff --git a/Dockerfile b/Dockerfile index 52d8ece..637d9b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,44 +1,47 @@ -FROM ghcr.io/linuxserver/baseimage-mono:LTS +FROM ghcr.io/linuxserver/baseimage-ubuntu:focal # set version label ARG BUILD_DATE ARG VERSION ARG RADARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="aptalca" +LABEL maintainer="thelamer" # environment settings ARG DEBIAN_FRONTEND="noninteractive" +ARG RADARR_BRANCH="master" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ - echo "**** install jq ****" && \ + echo "**** install packages ****" && \ apt-get update && \ - apt-get install -y \ - jq && \ + apt-get install --no-install-recommends -y \ + jq \ + libicu66 \ + libmediainfo0v5 \ + sqlite3 && \ echo "**** install radarr ****" && \ + mkdir -p /app/radarr/bin && \ if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl -sX GET "https://api.github.com/repos/Radarr/Radarr/releases" \ - | jq -r '.[0] | .tag_name'); \ + RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ + | jq -r '.[0].version'); \ fi && \ - radarr_url=$(curl -s https://api.github.com/repos/Radarr/Radarr/releases/tags/"${RADARR_RELEASE}" \ - |jq -r '.assets[].browser_download_url' |grep linux) && \ - mkdir -p \ - /app/radarr/bin && \ curl -o \ - /tmp/radar.tar.gz -L \ - "${radarr_url}" && \ + /tmp/radarr.tar.gz -L \ + "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=x64" && \ tar ixzf \ - /tmp/radar.tar.gz -C \ + /tmp/radarr.tar.gz -C \ /app/radarr/bin --strip-components=1 && \ - echo "**** clean up ****" && \ + echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \ + echo "**** cleanup ****" && \ rm -rf \ + /app/radarr/bin/Radarr.Update \ /tmp/* \ /var/lib/apt/lists/* \ /var/tmp/* -# add local files -COPY /root / +# copy local files +COPY root/ / # ports and volumes EXPOSE 7878 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2279d83..503224e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,44 +1,47 @@ -FROM ghcr.io/linuxserver/baseimage-mono:arm64v8-LTS +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal # set version label ARG BUILD_DATE ARG VERSION ARG RADARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="aptalca" +LABEL maintainer="thelamer" # environment settings ARG DEBIAN_FRONTEND="noninteractive" +ARG RADARR_BRANCH="master" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ - echo "**** install jq ****" && \ + echo "**** install packages ****" && \ apt-get update && \ - apt-get install -y \ - jq && \ + apt-get install --no-install-recommends -y \ + jq \ + libicu66 \ + libmediainfo0v5 \ + sqlite3 && \ echo "**** install radarr ****" && \ + mkdir -p /app/radarr/bin && \ if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl -sX GET "https://api.github.com/repos/Radarr/Radarr/releases" \ - | jq -r '.[0] | .tag_name'); \ + RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ + | jq -r '.[0].version'); \ fi && \ - radarr_url=$(curl -s https://api.github.com/repos/Radarr/Radarr/releases/tags/"${RADARR_RELEASE}" \ - |jq -r '.assets[].browser_download_url' |grep linux) && \ - mkdir -p \ - /app/radarr/bin && \ curl -o \ - /tmp/radar.tar.gz -L \ - "${radarr_url}" && \ + /tmp/radarr.tar.gz -L \ + "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm64" && \ tar ixzf \ - /tmp/radar.tar.gz -C \ + /tmp/radarr.tar.gz -C \ /app/radarr/bin --strip-components=1 && \ - echo "**** clean up ****" && \ + echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \ + echo "**** cleanup ****" && \ rm -rf \ + /app/radarr/bin/Radarr.Update \ /tmp/* \ /var/lib/apt/lists/* \ /var/tmp/* -# add local files -COPY /root / +# copy local files +COPY root/ / # ports and volumes EXPOSE 7878 diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 19cdc20..92ec8ab 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,44 +1,47 @@ -FROM ghcr.io/linuxserver/baseimage-mono:arm32v7-LTS +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal # set version label ARG BUILD_DATE ARG VERSION ARG RADARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="aptalca" +LABEL maintainer="thelamer" # environment settings ARG DEBIAN_FRONTEND="noninteractive" +ARG RADARR_BRANCH="master" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ - echo "**** install jq ****" && \ + echo "**** install packages ****" && \ apt-get update && \ - apt-get install -y \ - jq && \ + apt-get install --no-install-recommends -y \ + jq \ + libicu66 \ + libmediainfo0v5 \ + sqlite3 && \ echo "**** install radarr ****" && \ + mkdir -p /app/radarr/bin && \ if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl -sX GET "https://api.github.com/repos/Radarr/Radarr/releases" \ - | jq -r '.[0] | .tag_name'); \ + RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ + | jq -r '.[0].version'); \ fi && \ - radarr_url=$(curl -s https://api.github.com/repos/Radarr/Radarr/releases/tags/"${RADARR_RELEASE}" \ - |jq -r '.assets[].browser_download_url' |grep linux) && \ - mkdir -p \ - /app/radarr/bin && \ curl -o \ - /tmp/radar.tar.gz -L \ - "${radarr_url}" && \ + /tmp/radarr.tar.gz -L \ + "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm" && \ tar ixzf \ - /tmp/radar.tar.gz -C \ + /tmp/radarr.tar.gz -C \ /app/radarr/bin --strip-components=1 && \ - echo "**** clean up ****" && \ + echo "**** cleanup ****" && \ + echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \ rm -rf \ + /app/radarr/bin/Radarr.Update \ /tmp/* \ /var/lib/apt/lists/* \ /var/tmp/* -# add local files -COPY /root / +# copy local files +COPY root/ / # ports and volumes EXPOSE 7878 diff --git a/Jenkinsfile b/Jenkinsfile index eba61be..413ed76 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,9 +16,6 @@ pipeline { GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') - EXT_GIT_BRANCH = 'master' - EXT_USER = 'Radarr' - EXT_REPO = 'Radarr' BUILD_VERSION_ARG = 'RADARR_RELEASE' LS_USER = 'linuxserver' LS_REPO = 'docker-radarr' @@ -101,21 +98,14 @@ pipeline { /* ######################## External Release Tagging ######################## */ - // If this is a devel github release use the first in an array from github to determine the ext tag - stage("Set ENV github_devel"){ + // If this is a custom command to determine version use that command + stage("Set tag custom bash"){ steps{ script{ env.EXT_RELEASE = sh( - script: '''curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases | jq -r '.[0] | .tag_name' ''', + script: ''' curl -sL https://radarr.servarr.com/v1/update/master/changes?os=linux | jq -r '.[0].version' ''', returnStdout: true).trim() - } - } - } - // If this is a stable or devel github release generate the link for the build message - stage("Set ENV github_link"){ - steps{ - script{ - env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE + env.RELEASE_LINK = 'custom_command' } } } @@ -656,11 +646,11 @@ pipeline { "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash - curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases | jq '.[0] |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json + echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ "target_commitish": "master",\ "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ - "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start + "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**Remote Changes:**\\n\\n' > start printf '","draft": false,"prerelease": false}' >> 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/README.md b/README.md index 71a1b7c..6cb07d6 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,6 @@ This image provides various versions that are available via tags. `latest` tag u | Tag | Description | | :----: | --- | | latest | Stable Radarr releases | -| 5.14 | Stable Radarr releases, but run on Mono 5.14 | | nightly | Nightly Radarr releases | ## Usage @@ -241,6 +240,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **11.28.20:** - Switch to v3 .NET CORE builds (no more mono, `5.14` tag is deprecated). Rebase to Focal (for issues on arm32v7, [see here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal)). * **05.04.20:** - Move app to /app. * **01.08.19:** - Rebase to Linuxserver LTS mono version. * **13.06.19:** - Add env variable for setting umask. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 15a5117..e67b018 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -2,14 +2,12 @@ # jenkins variables project_name: docker-radarr -external_type: github_devel +external_type: na +custom_version_command: curl -sL https://radarr.servarr.com/v1/update/master/changes?os=linux | jq -r '.[0].version' release_type: stable release_tag: latest ls_branch: master repo_vars: - - EXT_GIT_BRANCH = 'master' - - EXT_USER = 'Radarr' - - EXT_REPO = 'Radarr' - BUILD_VERSION_ARG = 'RADARR_RELEASE' - LS_USER = 'linuxserver' - LS_REPO = 'docker-radarr' diff --git a/readme-vars.yml b/readme-vars.yml index 2e730cc..2798f68 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -18,7 +18,6 @@ available_architectures: development_versions: true development_versions_items: - { tag: "latest", desc: "Stable Radarr releases" } - - { tag: "5.14", desc: "Stable Radarr releases, but run on Mono 5.14" } - { tag: "nightly", desc: "Nightly Radarr releases" } # container parameters @@ -51,6 +50,7 @@ app_setup_block: | # changelog changelogs: + - { date: "11.28.20:", desc: "Switch to v3 .NET CORE builds (no more mono, `5.14` tag is deprecated). Rebase to Focal (for issues on arm32v7, [see here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal))." } - { date: "05.04.20:", desc: "Move app to /app." } - { date: "01.08.19:", desc: "Rebase to Linuxserver LTS mono version." } - { date: "13.06.19:", desc: "Add env variable for setting umask." }