From 2308c6e5ab78bca4089d04f894ee3d36f6e0497f Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Tue, 23 Mar 2021 15:43:13 +1100
Subject: [PATCH] DCD-1253: Add pipelines generator template and convert to the
 newer CLI-based builder with multi-repo support.

---
 bitbucket-pipelines.yml    | 2688 +++++++++++++++++++++++-------------
 bitbucket-pipelines.yml.j2 |  164 +++
 pipelines-generator.py     |   55 +
 3 files changed, 1958 insertions(+), 949 deletions(-)
 create mode 100644 bitbucket-pipelines.yml.j2
 create mode 100755 pipelines-generator.py

diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 133347c..4daddea 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -1,3 +1,8 @@
+---
+# NOTE: This file is generated from `bitbucket-pipelines.yml.j2` via `pipelines-generator.py`:
+#
+#     python3 pipelines-generator.py > bitbucket-pipelines.yml
+
 image: atlassian/docker-release-maker:latest
 definitions:
   services:
@@ -8,291 +13,1743 @@ options:
   size: 2x
 
 pipelines:
+
+  branches:
+    ######################################################################
+    # Master branch: Do full release for each image flavour
+    ######################################################################
+    master:
+      - step:
+          name: Check if pipelines config is up-to-date...
+          script:
+            - python3 pipelines-generator.py > bitbucket-piplines.yml.expected && diff bitbucket-pipelines.yml bitbucket-piplines.yml.expected
+
+      - parallel:
+
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 1
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='0'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 2
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='1'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 3
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='2'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 4
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='3'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 5
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='4'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 6
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='5'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 7
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='6'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 8
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='7'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 9
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='8'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 10
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='9'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 11
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='10'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 12
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='11'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 1
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='0'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 2
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='1'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 3
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='2'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 4
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='3'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 5
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='4'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 6
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='5'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 7
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='6'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 8
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='7'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 9
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='8'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 10
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='9'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 11
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='10'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 12
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='11'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 1
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='0'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 2
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='1'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 3
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='2'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 4
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='3'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 5
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='4'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 6
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='5'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 7
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='6'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 8
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='7'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 9
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='8'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 10
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='9'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 11
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='10'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 12
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='11'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --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
+
   custom:
     ######################################################################
     # Custom: Do full release for each image flavour
     ######################################################################
     new-releases:
-      - step:
-          name: Confluence Alpine (Batch 1)
-          services:
-            - docker
-          script:
-            - git submodule update --init --recursive
-            - export START_VERSION='6'
-            - export END_VERSION='7'
-            - export JOB_OFFSET='0'
-            - export JOBS_TOTAL='5'
-            - export DEFAULT_RELEASE='false'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE='Dockerfile-alpine'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-            - export CONCURRENT_BUILDS='1'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --create
-      - step:
-          name: Confluence Alpine (Batch 2)
-          services:
-            - docker
-          script:
-            - git submodule update --init --recursive
-            - export START_VERSION='6'
-            - export END_VERSION='7'
-            - export JOB_OFFSET='1'
-            - export JOBS_TOTAL='5'
-            - export DEFAULT_RELEASE='false'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE='Dockerfile-alpine'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-            - export CONCURRENT_BUILDS='1'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --create
-      - step:
-          name: Confluence Alpine (Batch 3)
-          services:
-            - docker
-          script:
-            - git submodule update --init --recursive
-            - export START_VERSION='6'
-            - export END_VERSION='7'
-            - export JOB_OFFSET='2'
-            - export JOBS_TOTAL='5'
-            - export DEFAULT_RELEASE='false'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE='Dockerfile-alpine'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-            - export CONCURRENT_BUILDS='1'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --create
-      - step:
-          name: Confluence Alpine (Batch 4)
-          services:
-            - docker
-          script:
-            - git submodule update --init --recursive
-            - export START_VERSION='6'
-            - export END_VERSION='7'
-            - export JOB_OFFSET='3'
-            - export JOBS_TOTAL='5'
-            - export DEFAULT_RELEASE='false'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE='Dockerfile-alpine'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-            - export CONCURRENT_BUILDS='1'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --create
-      - step:
-          name: Confluence Alpine (Batch 5)
-          services:
-            - docker
-          script:
-            - git submodule update --init --recursive
-            - export START_VERSION='6'
-            - export END_VERSION='7'
-            - export JOB_OFFSET='4'
-            - export JOBS_TOTAL='5'
-            - export DEFAULT_RELEASE='false'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE='Dockerfile-alpine'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-            - export CONCURRENT_BUILDS='1'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --create
-      - step:
-          name: Confluence Ubuntu JDK 8 (Batch 1)
-          services:
-            - docker
-          script:
-            - git submodule update --init --recursive
-            - export START_VERSION='6'
-            - export END_VERSION='7.1'
-            - export JOB_OFFSET='0'
-            - export JOBS_TOTAL='5'
-            - export DEFAULT_RELEASE='true'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-            - export CONCURRENT_BUILDS='1'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --create
-      - step:
-          name: Confluence Ubuntu JDK 8 (Batch 2)
-          services:
-            - docker
-          script:
-            - git submodule update --init --recursive
-            - export START_VERSION='6'
-            - export END_VERSION='7.1'
-            - export JOB_OFFSET='1'
-            - export JOBS_TOTAL='5'
-            - export DEFAULT_RELEASE='true'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-            - export CONCURRENT_BUILDS='1'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --create
-      - step:
-          name: Confluence Ubuntu JDK 8 (Batch 3)
-          services:
-            - docker
-          script:
-            - git submodule update --init --recursive
-            - export START_VERSION='6'
-            - export END_VERSION='7.1'
-            - export JOB_OFFSET='2'
-            - export JOBS_TOTAL='5'
-            - export DEFAULT_RELEASE='true'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-            - export CONCURRENT_BUILDS='1'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --create
-      - step:
-          name: Confluence Ubuntu JDK 8 (Batch 5)
-          services:
-            - docker
-          script:
-            - git submodule update --init --recursive
-            - export START_VERSION='6'
-            - export END_VERSION='7.1'
-            - export JOB_OFFSET='3'
-            - export JOBS_TOTAL='5'
-            - export DEFAULT_RELEASE='true'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-            - export CONCURRENT_BUILDS='1'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --create
-      - step:
-          name: Confluence Ubuntu JDK 8 (Batch 5)
-          services:
-            - docker
-          script:
-            - git submodule update --init --recursive
-            - export START_VERSION='6'
-            - export END_VERSION='7.1'
-            - export JOB_OFFSET='4'
-            - export JOBS_TOTAL='5'
-            - export DEFAULT_RELEASE='true'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-            - export CONCURRENT_BUILDS='1'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --create
-      - step:
-          name: Confluence Ubuntu JDK 11 (Batch 1)
-          services:
-            - docker
-          script:
-            - git submodule update --init --recursive
-            - export START_VERSION='7.1'
-            - export END_VERSION='8'
-            - export JOB_OFFSET='0'
-            - export JOBS_TOTAL='5'
-            - export DEFAULT_RELEASE='true'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='jdk11,ubuntu'
-            - export CONCURRENT_BUILDS='1'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --create --create-eap
-      - step:
-          name: Confluence Ubuntu JDK 11 (Batch 2)
-          services:
-            - docker
-          script:
-            - git submodule update --init --recursive
-            - export START_VERSION='7.1'
-            - export END_VERSION='8'
-            - export JOB_OFFSET='1'
-            - export JOBS_TOTAL='5'
-            - export DEFAULT_RELEASE='true'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='jdk11,ubuntu'
-            - export CONCURRENT_BUILDS='1'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --create --create-eap
-      - step:
-          name: Confluence Ubuntu JDK 11 (Batch 3)
-          services:
-            - docker
-          script:
-            - git submodule update --init --recursive
-            - export START_VERSION='7.1'
-            - export END_VERSION='8'
-            - export JOB_OFFSET='2'
-            - export JOBS_TOTAL='5'
-            - export DEFAULT_RELEASE='true'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='jdk11,ubuntu'
-            - export CONCURRENT_BUILDS='1'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --create --create-eap
-      - step:
-          name: Confluence Ubuntu JDK 11 (Batch 4)
-          services:
-            - docker
-          script:
-            - git submodule update --init --recursive
-            - export START_VERSION='7.1'
-            - export END_VERSION='8'
-            - export JOB_OFFSET='3'
-            - export JOBS_TOTAL='5'
-            - export DEFAULT_RELEASE='true'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='jdk11,ubuntu'
-            - export CONCURRENT_BUILDS='1'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --create --create-eap
-      - step:
-          name: Confluence Ubuntu JDK 11 (Batch 5)
-          services:
-            - docker
-          script:
-            - git submodule update --init --recursive
-            - export START_VERSION='7.1'
-            - export END_VERSION='8'
-            - export JOB_OFFSET='4'
-            - export JOBS_TOTAL='5'
-            - export DEFAULT_RELEASE='true'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='jdk11,ubuntu'
-            - export CONCURRENT_BUILDS='1'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --create --create-eap
+
+      - parallel:
+
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 1
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='0'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 2
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='1'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 3
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='2'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 4
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='3'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 5
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='4'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 6
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='5'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 7
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='6'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 8
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='7'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 9
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='8'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 10
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='9'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 11
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='10'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Alpine JDK 8 - Batch 12
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7'
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk8:alpine'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='11'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 1
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='0'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 2
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='1'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 3
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='2'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 4
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='3'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 5
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='4'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 6
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='5'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 7
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='6'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 8
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='7'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 9
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='8'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 10
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='9'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 11
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='10'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 8 - Batch 12
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='6'
+                  --end-version='7.1'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:8-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='11'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 1
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='0'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 2
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='1'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 3
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='2'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 4
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='3'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 5
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='4'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 6
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='5'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 7
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='6'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 8
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='7'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 9
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='8'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 10
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='9'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 11
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='10'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
+        - step:
+            name: Confluence Ubuntu JDK 11 - Batch 12
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='7.1'
+                  --end-version='8'
+                  --default-release
+                  --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes=''
+                  --concurrent-builds='1'
+                  --job-offset='11'
+                  --jobs-total='12'
+                  --docker-repos='atlassian/confluence,atlassian/confluenec-servert'
+                  --push
+ 
+
     custom-release:
       - variables:
           - name: CONFLUENCE_VERSION
@@ -309,675 +1766,8 @@ pipelines:
             - snyk auth @SNYK_TOKEN
             - snyk container test atlassian/confluence-server:${DOCKER_TAG} --severity-threshold=high
             - docker push atlassian/confluence-server:${DOCKER_TAG}
-  branches:
-    ######################################################################
-    # Master branch: Do full release for each image flavour
-    ######################################################################
-    master:
-      - parallel:
-          - step:
-              name: Confluence Alpine(Batch 1)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7'
-                - export JOB_OFFSET='0'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='false'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE='Dockerfile-alpine'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Alpine(Batch 2)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7'
-                - export JOB_OFFSET='1'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='false'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE='Dockerfile-alpine'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Alpine(Batch 3)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7'
-                - export JOB_OFFSET='2'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='false'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE='Dockerfile-alpine'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Alpine(Batch 4)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7'
-                - export JOB_OFFSET='3'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='false'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE='Dockerfile-alpine'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Alpine(Batch 5)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7'
-                - export JOB_OFFSET='4'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='false'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE='Dockerfile-alpine'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Alpine(Batch 6)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7'
-                - export JOB_OFFSET='5'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='false'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE='Dockerfile-alpine'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Alpine(Batch 7)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7'
-                - export JOB_OFFSET='6'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='false'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE='Dockerfile-alpine'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Alpine(Batch 8)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7'
-                - export JOB_OFFSET='7'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='false'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE='Dockerfile-alpine'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Alpine(Batch 9)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7'
-                - export JOB_OFFSET='8'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='false'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE='Dockerfile-alpine'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Alpine(Batch 10)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7'
-                - export JOB_OFFSET='9'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='false'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE='Dockerfile-alpine'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Alpine(Batch 11)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7'
-                - export JOB_OFFSET='10'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='false'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE='Dockerfile-alpine'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Alpine(Batch 12)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7'
-                - export JOB_OFFSET='11'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='false'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE='Dockerfile-alpine'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 8(Batch 1)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7.1'
-                - export JOB_OFFSET='0'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 8(Batch 2)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7.1'
-                - export JOB_OFFSET='1'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 8(Batch 3)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7.1'
-                - export JOB_OFFSET='2'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 8(Batch 4)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7.1'
-                - export JOB_OFFSET='3'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 8(Batch 5)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7.1'
-                - export JOB_OFFSET='4'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 8(Batch 6)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7.1'
-                - export JOB_OFFSET='5'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 8(Batch 7)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7.1'
-                - export JOB_OFFSET='6'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 8(Batch 8)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7.1'
-                - export JOB_OFFSET='7'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 8(Batch 9)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7.1'
-                - export JOB_OFFSET='8'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 8(Batch 10)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7.1'
-                - export JOB_OFFSET='9'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 8(Batch 11)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7.1'
-                - export JOB_OFFSET='10'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 8(Batch 12)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='6'
-                - export END_VERSION='7.1'
-                - export JOB_OFFSET='11'
-                - export JOBS_TOTAL='12'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_BUILDARGS='BASE_IMAGE=adoptopenjdk:8-hotspot'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 11(Batch 1)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='7.1'
-                - export END_VERSION='8'
-                - export JOB_OFFSET='0'
-                - export JOBS_TOTAL='11'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='jdk11,ubuntu'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 11(Batch 2)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='7.1'
-                - export END_VERSION='8'
-                - export JOB_OFFSET='1'
-                - export JOBS_TOTAL='11'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='jdk11,ubuntu'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 11(Batch 3)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='7.1'
-                - export END_VERSION='8'
-                - export JOB_OFFSET='2'
-                - export JOBS_TOTAL='11'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='jdk11,ubuntu'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 11(Batch 4)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='7.1'
-                - export END_VERSION='8'
-                - export JOB_OFFSET='3'
-                - export JOBS_TOTAL='11'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='jdk11,ubuntu'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 11(Batch 5)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='7.1'
-                - export END_VERSION='8'
-                - export JOB_OFFSET='4'
-                - export JOBS_TOTAL='11'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='jdk11,ubuntu'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 11(Batch 6)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='7.1'
-                - export END_VERSION='8'
-                - export JOB_OFFSET='5'
-                - export JOBS_TOTAL='11'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='jdk11,ubuntu'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 11(Batch 7)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='7.1'
-                - export END_VERSION='8'
-                - export JOB_OFFSET='6'
-                - export JOBS_TOTAL='11'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='jdk11,ubuntu'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 11(Batch 8)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='7.1'
-                - export END_VERSION='8'
-                - export JOB_OFFSET='7'
-                - export JOBS_TOTAL='11'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='jdk11,ubuntu'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 11(Batch 9)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='7.1'
-                - export END_VERSION='8'
-                - export JOB_OFFSET='8'
-                - export JOBS_TOTAL='11'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='jdk11,ubuntu'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 11(Batch 10)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='7.1'
-                - export END_VERSION='8'
-                - export JOB_OFFSET='9'
-                - export JOBS_TOTAL='11'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='jdk11,ubuntu'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-          - step:
-              name: Confluence Ubuntu JDK 11(Batch 11)
-              services:
-                - docker
-              script:
-                - git submodule update --init --recursive
-                - export START_VERSION='7.1'
-                - export END_VERSION='8'
-                - export JOB_OFFSET='10'
-                - export JOBS_TOTAL='11'
-                - export DEFAULT_RELEASE='true'
-                - export DOCKER_REPO='atlassian/confluence-server'
-                - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-                - export MAC_PRODUCT_KEY='confluence'
-                - export TAG_SUFFIXES='jdk11,ubuntu'
-                - export CONCURRENT_BUILDS='1'
-                - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-                - python /usr/src/app/run.py --update
-      - 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
+
+
   pull-requests:
     ######################################################################
     # All other branches & PRs; run unit tests & functional tests
diff --git a/bitbucket-pipelines.yml.j2 b/bitbucket-pipelines.yml.j2
new file mode 100644
index 0000000..9cffd80
--- /dev/null
+++ b/bitbucket-pipelines.yml.j2
@@ -0,0 +1,164 @@
+---
+# NOTE: This file is generated from `bitbucket-pipelines.yml.j2` via `pipelines-generator.py`:
+#
+#     python3 pipelines-generator.py > bitbucket-pipelines.yml
+
+image: atlassian/docker-release-maker:latest
+definitions:
+  services:
+    docker:
+      memory: 4096
+
+options:
+  size: 2x
+
+pipelines:
+
+  branches:
+    ######################################################################
+    # Master branch: Do full release for each image flavour
+    ######################################################################
+    master:
+      - step:
+          name: Check if pipelines config is up-to-date...
+          script:
+            - python3 pipelines-generator.py > bitbucket-piplines.yml.expected && diff bitbucket-pipelines.yml bitbucket-piplines.yml.expected
+
+      - parallel:
+
+{% for (name, pdata) in images.items() %}
+  {% for (jdkver, appdata) in pdata.items() %}
+    {% for offset in range(0, batches) %}
+
+        - step:
+            name: {{ name }} JDK {{ jdkver }} - Batch {{ offset + 1 }}
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --update
+                  --start-version='{{ appdata.start_version }}'
+                  --end-version='{{ appdata.end_version }}'
+                  {% if appdata.default_release %}
+                  --default-release
+                  {% endif %}
+                  --dockerfile-buildargs='BASE_IMAGE={{ appdata.base_image }}'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes='{{ tag_suffixes|join(',') }}'
+                  --concurrent-builds='1'
+                  --job-offset='{{ offset }}'
+                  --jobs-total='{{ batches }}'
+                  --docker-repos='{{ appdata.docker_repos|join(',') }}'
+                  --push
+ 
+    {% endfor %}
+  {% 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
+
+  custom:
+    ######################################################################
+    # Custom: Do full release for each image flavour
+    ######################################################################
+    new-releases:
+
+      - parallel:
+
+{% for (name, pdata) in images.items() %}
+  {% for (jdkver, appdata) in pdata.items() %}
+    {% for offset in range(0, batches) %}
+
+        - step:
+            name: {{ name }} JDK {{ jdkver }} - Batch {{ offset + 1 }}
+            services:
+              - docker
+            script:
+              - git submodule update --init --recursive
+              - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+              - >
+                python ../docker-release-maker/make-releases.py 
+                  --create
+                  --start-version='{{ appdata.start_version }}'
+                  --end-version='{{ appdata.end_version }}'
+                  {% if appdata.default_release %}
+                  --default-release
+                  {% endif %}
+                  --dockerfile-buildargs='BASE_IMAGE={{ appdata.base_image }}'
+                  --dockerfile-version-arg='CONFLUENCE_VERSION'
+                  --mac-product-key='confluence'
+                  --tag-suffixes='{{ tag_suffixes|join(',') }}'
+                  --concurrent-builds='1'
+                  --job-offset='{{ offset }}'
+                  --jobs-total='{{ batches }}'
+                  --docker-repos='{{ appdata.docker_repos|join(',') }}'
+                  --push
+ 
+    {% endfor %}
+  {% endfor %}
+{% endfor %}
+
+    custom-release:
+      - variables:
+          - name: CONFLUENCE_VERSION
+          - name: DOCKER_TAG
+      - step:
+          services:
+            - docker
+          script:
+            - git submodule update --init --recursive
+            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+            - >
+              docker build -t atlassian/confluence-server:${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}
+
+
+  pull-requests:
+    ######################################################################
+    # All other branches & PRs; run unit tests & functional tests
+    # against latest app version
+    ######################################################################
+    '**':
+      - step:
+          image: python:3.7-alpine3.9
+          services:
+            - docker
+          script:
+            - apk add --no-cache git
+            - git submodule update --init --recursive
+            - pip install -q -r shared-components/tests/requirements.txt
+            - export PYTHONPATH=./shared-components/tests:$PYTHONPATH
+            - export DOCKERFILE='Dockerfile'
+            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
+            - export MAC_PRODUCT_KEY='confluence'
+            - py.test tests/
+            - py.test shared-components/tests/
+            - export DOCKERFILE='Dockerfile-alpine'
+            - py.test tests/
+            - py.test shared-components/tests/
+      - step:
+          services:
+            - docker
+          script:
+            - apk add --no-cache git docker-compose jq curl
+            - git submodule update --init --recursive
+            - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions/latest | jq -r .name`
+            - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image .
+            - export IS_RELEASE=false
+            - /usr/src/app/integration_test.sh test-image $IS_RELEASE
+
diff --git a/pipelines-generator.py b/pipelines-generator.py
new file mode 100755
index 0000000..10a73c6
--- /dev/null
+++ b/pipelines-generator.py
@@ -0,0 +1,55 @@
+
+from pathlib import Path
+import os
+import jinja2 as j2
+
+TEMPLATE_FILE = 'bitbucket-pipelines.yml.j2'
+REPOS = ['atlassian/confluence', 'atlassian/confluenec-servert']
+
+images = {
+    'Confluence Alpine': {
+        8: {
+            'start_version': '6',
+            'end_version': '7',
+            'default_release': False,
+            'base_image': 'adoptopenjdk/openjdk8:alpine',
+            'tag_suffixes': ['alpine','alpine-adoptopenjdk8'],
+            'dockerfile': 'Dockerfile-alpine',
+            'docker_repos': REPOS,
+        },
+    },
+    'Confluence Ubuntu': {
+        8: {
+            'start_version': '6',
+            'end_version': '7.1',
+            'default_release': True,
+            'base_image': 'adoptopenjdk:8-hotspot',
+            'tag_suffixes': ['adoptopenjdk8', 'jdk8', 'ubuntu', 'ubuntu-18.04-adoptopenjdk8'],
+            'dockerfile': 'Dockerfile',
+            'docker_repos': REPOS,
+        },
+        11: {
+            'start_version': '7.1',
+            'end_version': '8',
+            'default_release': True,
+            'base_image': 'adoptopenjdk:11-hotspot',
+            'tag_suffixes': ['adoptopenjdk11', 'jdk11', 'ubuntu', 'ubuntu-18.04-adoptopenjdk11'],
+            'dockerfile': 'Dockerfile',
+            'docker_repos': REPOS,
+        }
+    },
+}
+
+
+def main():
+    jenv = j2.Environment(
+        loader=j2.FileSystemLoader('.'),
+        lstrip_blocks=True,
+        trim_blocks=True)
+    template = jenv.get_template(TEMPLATE_FILE)
+    generated_output = template.render(images=images, batches=12)
+
+    print(generated_output)
+
+if __name__ == '__main__':
+    main()