From b72b5564639cdc3df238800cce9bacef76f13083 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Fri, 3 Sep 2021 10:10:48 +1000 Subject: [PATCH] Ensure we're pushing to both repo aliases for the README and custom builds. --- bitbucket-pipelines.yml | 8 +++++--- bitbucket-pipelines.yml.j2 | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 027a28d..f0e23e6 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -336,6 +336,8 @@ pipelines: - pip install -q requests - export DOCKER_REPO='atlassian/confluence-server' - 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 - 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} . - snyk auth $SNYK_TOKEN - - snyk container test atlassian/confluence-server:${DOCKER_TAG} --severity-threshold=high - - docker push atlassian/confluence-server:${DOCKER_TAG} + - snyk container test atlassian/confluence:${DOCKER_TAG} --severity-threshold=high + - docker push atlassian/confluence:${DOCKER_TAG} diff --git a/bitbucket-pipelines.yml.j2 b/bitbucket-pipelines.yml.j2 index dcfcd88..01bb5ec 100644 --- a/bitbucket-pipelines.yml.j2 +++ b/bitbucket-pipelines.yml.j2 @@ -69,6 +69,8 @@ pipelines: - pip install -q requests - export DOCKER_REPO='atlassian/confluence-server' - 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 - 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} . - snyk auth $SNYK_TOKEN - - snyk container test atlassian/confluence-server:${DOCKER_TAG} --severity-threshold=high - - docker push atlassian/confluence-server:${DOCKER_TAG} + - snyk container test atlassian/confluence:${DOCKER_TAG} --severity-threshold=high + - docker push atlassian/confluence:${DOCKER_TAG}