From b041840bccb14faa084bf138d2be170265374a73 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 8 Sep 2019 19:06:55 -0700 Subject: [PATCH] pull artifacts from Azure upstream --- Dockerfile | 10 +++++----- Dockerfile.aarch64 | 10 +++++----- Dockerfile.armhf | 10 +++++----- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 1 + 7 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index ecba4ee..9b58faf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG BUILD_DATE ARG VERSION ARG RADARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="sparklyballs" +LABEL maintainer="thelamer" # environment settings ARG DEBIAN_FRONTEND="noninteractive" @@ -18,11 +18,11 @@ RUN \ jq && \ echo "**** install radarr ****" && \ if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl -sL GET https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/history?recordsNumber=100 | \ - jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="aphrodite") | select(.pullRequestId == null)) | .version'); \ + RADARR_RELEASE=$(curl -sL "https://radarr.lidarr.audio/v1/update/aphrodite/changes?os=linux" \ + | jq -r '.[0].version'); \ fi && \ - RADARR_JOBID=$(curl -s "https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/build/${RADARR_RELEASE}" | jq -jr '. | .build.jobs[0].jobId') \ - RADARR_DURL="https://ci.appveyor.com/api/buildjobs/${RADARR_JOBID}/artifacts/_artifacts/Radarr.aphrodite.${RADARR_RELEASE}.linux.tar.gz"; \ + RADARR_DURL=$(curl -sL "https://radarr.lidarr.audio/v1/update/aphrodite/changes?os=linux" \ + | jq -r "first(.[] | select(.version == \"${RADARR_RELEASE}\")) | .url") && \ mkdir -p \ /opt/radarr && \ curl -o \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 954c761..567cb6d 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -5,7 +5,7 @@ ARG BUILD_DATE ARG VERSION ARG RADARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="sparklyballs" +LABEL maintainer="thelamer" # environment settings ARG DEBIAN_FRONTEND="noninteractive" @@ -18,11 +18,11 @@ RUN \ jq && \ echo "**** install radarr ****" && \ if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl -sL GET https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/history?recordsNumber=100 | \ - jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="aphrodite") | select(.pullRequestId == null)) | .version'); \ + RADARR_RELEASE=$(curl -sL "https://radarr.lidarr.audio/v1/update/aphrodite/changes?os=linux" \ + | jq -r '.[0].version'); \ fi && \ - RADARR_JOBID=$(curl -s "https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/build/${RADARR_RELEASE}" | jq -jr '. | .build.jobs[0].jobId') \ - RADARR_DURL="https://ci.appveyor.com/api/buildjobs/${RADARR_JOBID}/artifacts/_artifacts/Radarr.aphrodite.${RADARR_RELEASE}.linux.tar.gz"; \ + RADARR_DURL=$(curl -sL "https://radarr.lidarr.audio/v1/update/aphrodite/changes?os=linux" \ + | jq -r "first(.[] | select(.version == \"${RADARR_RELEASE}\")) | .url") && \ mkdir -p \ /opt/radarr && \ curl -o \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index b187334..2f26181 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -5,7 +5,7 @@ ARG BUILD_DATE ARG VERSION ARG RADARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="sparklyballs" +LABEL maintainer="thelamer" # environment settings ARG DEBIAN_FRONTEND="noninteractive" @@ -18,11 +18,11 @@ RUN \ jq && \ echo "**** install radarr ****" && \ if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl -sL GET https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/history?recordsNumber=100 | \ - jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="aphrodite") | select(.pullRequestId == null)) | .version'); \ + RADARR_RELEASE=$(curl -sL "https://radarr.lidarr.audio/v1/update/aphrodite/changes?os=linux" \ + | jq -r '.[0].version'); \ fi && \ - RADARR_JOBID=$(curl -s "https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/build/${RADARR_RELEASE}" | jq -jr '. | .build.jobs[0].jobId') \ - RADARR_DURL="https://ci.appveyor.com/api/buildjobs/${RADARR_JOBID}/artifacts/_artifacts/Radarr.aphrodite.${RADARR_RELEASE}.linux.tar.gz"; \ + RADARR_DURL=$(curl -sL "https://radarr.lidarr.audio/v1/update/aphrodite/changes?os=linux" \ + | jq -r "first(.[] | select(.version == \"${RADARR_RELEASE}\")) | .url") && \ mkdir -p \ /opt/radarr && \ curl -o \ diff --git a/Jenkinsfile b/Jenkinsfile index 0565c4c..1764cf2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -112,7 +112,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' curl -sL GET https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/history?recordsNumber=100 | jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="aphrodite") | select(.pullRequestId == null)) | .version' ''', + script: ''' curl -sL https://radarr.lidarr.audio/v1/update/aphrodite/changes?os=linux | jq -r '.[0].version' ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/README.md b/README.md index 4ef02ae..04e72d2 100644 --- a/README.md +++ b/README.md @@ -207,6 +207,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **08.09.19:** - Pull artifacts from new upstream Azure build env. * **01.08.19:** - Rebase to Linuxserver LTS mono version. * **13.06.19:** - Add env variable for setting umask. * **07.05.19:** - Add preview branch to releases. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index c3185d6..4b9a19c 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: docker-radarr external_type: na -custom_version_command: curl -sL GET https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/history?recordsNumber=100 | jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="aphrodite") | select(.pullRequestId == null)) | .version' +custom_version_command: curl -sL https://radarr.lidarr.audio/v1/update/aphrodite/changes?os=linux | jq -r '.[0].version' release_type: prerelease release_tag: preview ls_branch: preview diff --git a/readme-vars.yml b/readme-vars.yml index 620a70b..f36e499 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -46,6 +46,7 @@ app_setup_block: | # changelog changelogs: + - { date: "08.09.19:", desc: "Pull artifacts from new upstream Azure build env." } - { date: "01.08.19:", desc: "Rebase to Linuxserver LTS mono version." } - { date: "13.06.19:", desc: "Add env variable for setting umask." } - { date: "07.05.19:", desc: "Add preview branch to releases." }