From cd8d0b80fad2ebfcdcc5f1d06fe72274819fb6ec Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sat, 20 Aug 2022 12:59:50 +0100 Subject: [PATCH] Fix version fetch --- .github/workflows/external_trigger.yml | 2 +- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Jenkinsfile | 2 +- jenkins-vars.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 34c049f..9839072 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -18,7 +18,7 @@ jobs: fi echo "**** External trigger running off of develop branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_SONARR_DEVELOP\". ****" echo "**** Retrieving external version ****" - EXT_RELEASE=$(curl -sL 'https://services.sonarr.tv/v1/update/develop?version=4&os=linuxmusl' | jq -r '.[0].version') + EXT_RELEASE=$(curl -sL 'https://services.sonarr.tv/v1/update/develop/changes?version=4&os=linuxmusl' | 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 sonarr branch develop" diff --git a/Dockerfile b/Dockerfile index 86a10a7..e5889f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN \ echo "**** install sonarr ****" && \ mkdir -p /app/sonarr/bin && \ if [ -z ${SONARR_VERSION+x} ]; then \ - SONARR_VERSION=$(curl -sL "https://services.sonarr.tv/v1/update/${SONARR_BRANCH}?version=4&os=linuxmusl" \ + SONARR_VERSION=$(curl -sL "https://services.sonarr.tv/v1/update/${SONARR_BRANCH}/changes?version=4&os=linuxmusl" \ | jq -r '.[0].version'); \ fi && \ curl -o \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 1462111..ba7d22d 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -21,7 +21,7 @@ RUN \ echo "**** install sonarr ****" && \ mkdir -p /app/sonarr/bin && \ if [ -z ${SONARR_VERSION+x} ]; then \ - SONARR_VERSION=$(curl -sL "https://services.sonarr.tv/v1/update/${SONARR_BRANCH}?version=4&os=linuxmusl" \ + SONARR_VERSION=$(curl -sL "https://services.sonarr.tv/v1/update/${SONARR_BRANCH}/changes?version=4&os=linuxmusl" \ | jq -r '.[0].version'); \ fi && \ curl -o \ diff --git a/Jenkinsfile b/Jenkinsfile index 1351fac..7431cbb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -104,7 +104,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' curl -sL 'https://services.sonarr.tv/v1/update/develop?version=4&os=linuxmusl' | jq -r '.[0].version' ''', + script: ''' curl -sL 'https://services.sonarr.tv/v1/update/develop/changes?version=4&os=linuxmusl' | jq -r '.[0].version' ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index b1d2205..cdcf4fb 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: docker-sonarr external_type: na -custom_version_command: "curl -sL 'https://services.sonarr.tv/v1/update/develop?version=4&os=linuxmusl' | jq -r '.[0].version'" +custom_version_command: "curl -sL 'https://services.sonarr.tv/v1/update/develop/changes?version=4&os=linuxmusl' | jq -r '.[0].version'" release_type: prerelease release_tag: develop ls_branch: develop