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 DCD-1488-update-docker-repo (pull request #112)

Browse Source 
DCD-1488 update docker repo

Approved-by: Adam Brokes
This commit is contained in:
Nasser Ghazali-Beiklar 2022-03-17 04:44:13 +00:00
commit ae24c0b9ee
4 changed files with 67 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.snyk Normal file
View File

@ -0,0 +1,22 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.19.0
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
ignore:
SNYK-UBUNTU2004-EXPAT-2403934:
- '*':
reason: Ignore until March 25, 2022 - waiting for `adoptopenjdk/openjdk11` image update
expires: 2022-03-25T00:00:00.000Z
SNYK-UBUNTU2004-CYRUSSASL2-2408941:
- '*':
reason: Ignore until March 25, 2022 - waiting for `adoptopenjdk/openjdk11` image update
expires: 2022-03-25T00:00:00.000Z
SNYK-UBUNTU2004-EXPAT-2403778:
- '*':
reason: Ignore until March 25, 2022 - waiting for `adoptopenjdk/openjdk11` image update
expires: 2022-03-25T00:00:00.000Z
SNYK-UBUNTU2004-OPENSSL-2426343:
- '*':
reason: Ignore until March 25, 2022 - waiting for `adoptopenjdk/openjdk11` image update
expires: 2022-03-25T00:00:00.000Z
patch: {}

290
bitbucket-pipelines.yml
View File

@ -3,7 +3,7 @@
#
# python3 pipelines-generator.py > bitbucket-pipelines.yml
image: atlassian/docker-release-maker:latest
image: docker-public.packages.atlassian.com/atlassian/docker-release-maker:latest
definitions:
services:
docker:
@ -33,7 +33,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
@ -47,7 +47,7 @@ pipelines:
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='0' \
--jobs-total='12' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
@ -58,7 +58,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
@ -72,7 +72,7 @@ pipelines:
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='1' \
--jobs-total='12' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
@ -83,7 +83,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
@ -97,7 +97,7 @@ pipelines:
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='2' \
--jobs-total='12' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
@ -108,7 +108,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
@ -122,7 +122,7 @@ pipelines:
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='3' \
--jobs-total='12' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
@ -133,7 +133,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
@ -147,7 +147,7 @@ pipelines:
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='4' \
--jobs-total='12' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
@ -158,7 +158,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
@ -172,7 +172,7 @@ pipelines:
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='5' \
--jobs-total='12' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
@ -183,7 +183,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
@ -197,7 +197,7 @@ pipelines:
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='6' \
--jobs-total='12' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
@ -208,7 +208,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
@ -222,123 +222,11 @@ pipelines:
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='7' \
--jobs-total='12' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 11 - Batch 9
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
--start-version='7.4' \
--end-version='8' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='8' \
--jobs-total='12' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 11 - Batch 10
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
--start-version='7.4' \
--end-version='8' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='9' \
--jobs-total='12' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 11 - Batch 11
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
--start-version='7.4' \
--end-version='8' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='10' \
--jobs-total='12' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 11 - Batch 12
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
--start-version='7.4' \
--end-version='8' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='11' \
--jobs-total='12' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: Update README
image: python:3.7-alpine3.9
script:
- apk add --no-cache git
- git submodule update --init --recursive
- 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
######################################################################
# All other branches & PRs; run unit tests & functional tests
@ -394,7 +282,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
@ -409,7 +297,7 @@ pipelines:
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='0' \
--jobs-total='12' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
@ -420,7 +308,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
@ -435,7 +323,7 @@ pipelines:
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='1' \
--jobs-total='12' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
@ -446,7 +334,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
@ -461,7 +349,7 @@ pipelines:
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='2' \
--jobs-total='12' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
@ -472,7 +360,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
@ -487,7 +375,7 @@ pipelines:
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='3' \
--jobs-total='12' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
@ -498,7 +386,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
@ -513,7 +401,7 @@ pipelines:
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='4' \
--jobs-total='12' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
@ -524,7 +412,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
@ -539,7 +427,7 @@ pipelines:
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='5' \
--jobs-total='12' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
@ -550,7 +438,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
@ -565,7 +453,7 @@ pipelines:
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='6' \
--jobs-total='12' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
@ -576,7 +464,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
@ -591,111 +479,7 @@ pipelines:
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='7' \
--jobs-total='12' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 11 - Batch 9
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='7.4' \
--end-version='8' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='8' \
--jobs-total='12' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 11 - Batch 10
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='7.4' \
--end-version='8' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='9' \
--jobs-total='12' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 11 - Batch 11
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='7.4' \
--end-version='8' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='10' \
--jobs-total='12' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 11 - Batch 12
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='7.4' \
--end-version='8' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
--concurrent-builds='1' \
--job-offset='11' \
--jobs-total='12' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
@ -709,10 +493,10 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
docker build -t atlassian/confluence:${DOCKER_TAG}
docker build -t ${DOCKER_REGISTRY}/atlassian/confluence:${DOCKER_TAG}
--build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} .
- snyk auth $SNYK_TOKEN
- snyk container test atlassian/confluence:${DOCKER_TAG} --severity-threshold=high
- docker push atlassian/confluence:${DOCKER_TAG}
- snyk container test ${DOCKER_REGISTRY}/atlassian/confluence:${DOCKER_TAG} --severity-threshold=high
- docker push ${DOCKER_REGISTRY}/atlassian/confluence:${DOCKER_TAG}

26
bitbucket-pipelines.yml.j2
View File

@ -3,7 +3,7 @@
#
# python3 pipelines-generator.py > bitbucket-pipelines.yml
image: atlassian/docker-release-maker:latest
image: docker-public.packages.atlassian.com/atlassian/docker-release-maker:latest
definitions:
services:
docker:
@ -36,7 +36,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
@ -60,18 +60,6 @@ pipelines:
{% endfor %}
{% endfor %}
- step:
name: Update README
image: python:3.7-alpine3.9
script:
- apk add --no-cache git
- git submodule update --init --recursive
- 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
######################################################################
# All other branches & PRs; run unit tests & functional tests
@ -130,7 +118,7 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
@ -164,10 +152,10 @@ pipelines:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
docker build -t atlassian/confluence:${DOCKER_TAG}
docker build -t ${DOCKER_REGISTRY}/atlassian/confluence:${DOCKER_TAG}
--build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} .
- snyk auth $SNYK_TOKEN
- snyk container test atlassian/confluence:${DOCKER_TAG} --severity-threshold=high
- docker push atlassian/confluence:${DOCKER_TAG}
- snyk container test ${DOCKER_REGISTRY}/atlassian/confluence:${DOCKER_TAG} --severity-threshold=high
- docker push ${DOCKER_REGISTRY}/atlassian/confluence:${DOCKER_TAG}

2
pipelines-generator.py
View File

@ -27,7 +27,7 @@ def main():
lstrip_blocks=True,
trim_blocks=True)
template = jenv.get_template(TEMPLATE_FILE)
generated_output = template.render(images=images, batches=12)
generated_output = template.render(images=images, batches=8)
print(generated_output)