From a3c9f2ff706a8c8aa003208fadb862ee0afd367f Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 12 Apr 2022 12:45:23 +1000 Subject: [PATCH] For consistency use the same versions endpoint that the release maker uses --- bitbucket-pipelines.yml | 2 +- bitbucket-pipelines.yml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 352f5bd..29d477a 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -262,7 +262,7 @@ pipelines: script: - apk add --no-cache git docker-compose jq curl - git submodule update --init --recursive - - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions/latest | jq -r .name` + - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'` - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image . - export IS_RELEASE=false - /usr/src/app/post_build.sh test-image $IS_RELEASE diff --git a/bitbucket-pipelines.yml.j2 b/bitbucket-pipelines.yml.j2 index 09b1ca1..ae52f3f 100644 --- a/bitbucket-pipelines.yml.j2 +++ b/bitbucket-pipelines.yml.j2 @@ -95,7 +95,7 @@ pipelines: script: - apk add --no-cache git docker-compose jq curl - git submodule update --init --recursive - - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions/latest | jq -r .name` + - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'` - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image . - export IS_RELEASE=false - /usr/src/app/post_build.sh test-image $IS_RELEASE