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

Merged in jdk17 (pull request #125)

Browse Source 
Build Confluence 8.x + jdk17 (not default for now) [skip ci]

Approved-by: Steve Smith
Approved-by: Andrei Khudavets
This commit is contained in:
Dave Chevell 2022-08-16 04:06:27 +00:00 committed by Andrei Khudavets
commit 4e66ee2d88
2 changed files with 384 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

376
bitbucket-pipelines.yml
View File

@ -219,6 +219,190 @@ pipelines:
--push
- step:
name: JDK 17 - Batch 1
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
--start-version='8' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='0' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 17 - Batch 2
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
--start-version='8' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='1' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 17 - Batch 3
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
--start-version='8' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='2' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 17 - Batch 4
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
--start-version='8' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='3' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 17 - Batch 5
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
--start-version='8' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='4' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 17 - Batch 6
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
--start-version='8' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='5' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 17 - Batch 7
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
--start-version='8' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='6' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 17 - Batch 8
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--update \
--start-version='8' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='7' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
######################################################################
# All other branches & PRs; run unit tests & functional tests
@ -468,6 +652,198 @@ pipelines:
--push
- step:
name: JDK 17 - Batch 1
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='8' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='0' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 17 - Batch 2
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='8' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='1' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 17 - Batch 3
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='8' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='2' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 17 - Batch 4
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='8' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='3' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 17 - Batch 5
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='8' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='4' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 17 - Batch 6
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='8' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='5' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 17 - Batch 7
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='8' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='6' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
- step:
name: JDK 17 - Batch 8
services:
- docker
script:
- git submodule update --init --recursive
- echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='8' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='7' \
--jobs-total='8' \
--docker-repos='atlassian/confluence,atlassian/confluence-server' \
--push
custom-release:
- variables:
- name: CONFLUENCE_VERSION

8
pipelines-generator.py
View File

@ -15,6 +15,14 @@ images = {
'tag_suffixes': ['jdk11','ubuntu-jdk11'],
'dockerfile': 'Dockerfile',
'docker_repos': REPOS,
},
17: {
'start_version': '8',
'default_release': False,
'base_image': 'eclipse-temurin:17',
'tag_suffixes': ['jdk17','ubuntu-jdk17'],
'dockerfile': 'Dockerfile',
'docker_repos': REPOS,
}
},
}