From 1c43cee0632b04ee92ae97aef519e9a6a908dd89 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Fri, 11 Dec 2020 09:07:29 -0500
Subject: [PATCH] use jq instead of awk for version tagging

---
 .github/workflows/external_trigger.yml | 2 +-
 Jenkinsfile                            | 2 +-
 jenkins-vars.yml                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
index beb08a1..e70adf4 100644
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -18,7 +18,7 @@ jobs:
           fi
           echo "**** External trigger running off of alpine branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_DOCKER_COMPOSE_ALPINE\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sX GET "https://api.github.com/repos/docker/compose/releases/latest" | awk '/tag_name/{print $4;exit}' FS='[""]' | awk '$0="alpine-"$0')
+          EXT_RELEASE=$(curl -sX GET "https://api.github.com/repos/docker/compose/releases/latest" | jq -r '.tag_name' | awk '$0="alpine-"$0')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
             FAILURE_REASON="Can't retrieve external version for docker-compose branch alpine"
diff --git a/Jenkinsfile b/Jenkinsfile
index 4a409ed..8fabfd0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -103,7 +103,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -sX GET "https://api.github.com/repos/docker/compose/releases/latest" | awk '/tag_name/{print $4;exit}' FS='[""]' | awk '$0="alpine-"$0' ''',
+            script: ''' curl -sX GET "https://api.github.com/repos/docker/compose/releases/latest" | jq -r '.tag_name' | awk '$0="alpine-"$0' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 44daddb..07dbde2 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-docker-compose
 external_type: na
-custom_version_command: "curl -sX GET \"https://api.github.com/repos/docker/compose/releases/latest\" | awk '/tag_name/{print $4;exit}' FS='[\"\"]' | awk '$0=\"alpine-\"$0'"
+custom_version_command: "curl -sX GET \"https://api.github.com/repos/docker/compose/releases/latest\" | jq -r '.tag_name' | awk '$0=\"alpine-\"$0'"
 release_type: prerelease
 release_tag: alpine
 ls_branch: alpine