Mirrored_Repos/docker-atlassian-confluence-server
1
0
Fork 0
mirror of https://bitbucket.org/atlassian-docker/docker-atlassian-confluence-server.git synced 2024-08-30 18:22:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged in updated-version-endpoint (pull request #115)

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

Approved-by: Steve Smith
Approved-by: Nasser Ghazali-Beiklar
This commit is contained in:
Dylan Rathbone 2022-04-12 03:53:45 +00:00
commit d53cf3a8ca
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitbucket-pipelines.yml
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

2
bitbucket-pipelines.yml.j2
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