For consistency use the same versions endpoint that the release maker uses

This commit is contained in:
Dylan 2022-04-12 12:45:23 +10:00
parent 1db294078b
commit a3c9f2ff70
2 changed files with 2 additions and 2 deletions

View File

@ -262,7 +262,7 @@ pipelines:
script: script:
- apk add --no-cache git docker-compose jq curl - apk add --no-cache git docker-compose jq curl
- git submodule update --init --recursive - 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 . - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image .
- export IS_RELEASE=false - export IS_RELEASE=false
- /usr/src/app/post_build.sh test-image $IS_RELEASE - /usr/src/app/post_build.sh test-image $IS_RELEASE

View File

@ -95,7 +95,7 @@ pipelines:
script: script:
- apk add --no-cache git docker-compose jq curl - apk add --no-cache git docker-compose jq curl
- git submodule update --init --recursive - 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 . - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image .
- export IS_RELEASE=false - export IS_RELEASE=false
- /usr/src/app/post_build.sh test-image $IS_RELEASE - /usr/src/app/post_build.sh test-image $IS_RELEASE