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 repo-rename-fixes (pull request #105)

Browse Source 
Ensure we're pushing to both repo aliases for the README and custom builds.

Approved-by: Nasser Ghazali-Beiklar
This commit is contained in:
Steve Smith 2021-09-03 02:40:38 +00:00
commit fcf596759e
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bitbucket-pipelines.yml
View File

@ -336,6 +336,8 @@ pipelines:
- pip install -q requests - pip install -q requests
- export DOCKER_REPO='atlassian/confluence-server' - export DOCKER_REPO='atlassian/confluence-server'
- python shared-components/image/push-readme.py - python shared-components/image/push-readme.py
- export DOCKER_REPO='atlassian/confluence'
- python shared-components/image/push-readme.py
###################################################################### ######################################################################
@ -709,8 +711,8 @@ pipelines:
- git submodule update --init --recursive - git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- > - >
docker build -t atlassian/confluence-server:${DOCKER_TAG} docker build -t atlassian/confluence:${DOCKER_TAG}
--build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} . --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} .
- snyk auth $SNYK_TOKEN - snyk auth $SNYK_TOKEN
- snyk container test atlassian/confluence-server:${DOCKER_TAG} --severity-threshold=high - snyk container test atlassian/confluence:${DOCKER_TAG} --severity-threshold=high
- docker push atlassian/confluence-server:${DOCKER_TAG} - docker push atlassian/confluence:${DOCKER_TAG}

8
bitbucket-pipelines.yml.j2
View File

@ -69,6 +69,8 @@ pipelines:
- pip install -q requests - pip install -q requests
- export DOCKER_REPO='atlassian/confluence-server' - export DOCKER_REPO='atlassian/confluence-server'
- python shared-components/image/push-readme.py - python shared-components/image/push-readme.py
- export DOCKER_REPO='atlassian/confluence'
- python shared-components/image/push-readme.py
###################################################################### ######################################################################
@ -164,8 +166,8 @@ pipelines:
- git submodule update --init --recursive - git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- > - >
docker build -t atlassian/confluence-server:${DOCKER_TAG} docker build -t atlassian/confluence:${DOCKER_TAG}
--build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} . --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} .
- snyk auth $SNYK_TOKEN - snyk auth $SNYK_TOKEN
- snyk container test atlassian/confluence-server:${DOCKER_TAG} --severity-threshold=high - snyk container test atlassian/confluence:${DOCKER_TAG} --severity-threshold=high
- docker push atlassian/confluence-server:${DOCKER_TAG} - docker push atlassian/confluence:${DOCKER_TAG}