Skip to content
This repository was archived by the owner on Feb 16, 2023. It is now read-only.

use jq instead of awk for version tagging #23

Merged
aptalca merged 1 commit into from
Dec 11, 2020
Merged

use jq instead of awk for version tagging #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/external_trigger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion jenkins-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down