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 keep-bundling-jdk11-with-8 (pull request #151)

Browse Source 
Push jdk11 tags for 8.x Confluence

* Push jdk11 tags for 8.x Confluence

* Update README


Approved-by: Minh Tran
Approved-by: Adam Brokes
This commit is contained in:
Eugene Ivantsov 2024-02-16 00:12:36 +00:00
parent 642cc3bb95
commit de71ecbd95
3 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -484,9 +484,12 @@ install the latest 7.13.x version with Eclipse Temurin OpenJDK 11.
# Supported JDK versions # Supported JDK versions
All the Atlassian Docker images are now JDK11 only, and generated from the All the Atlassian Docker images are generated from the
[official Eclipse Temurin OpenJDK Docker images](https://hub.docker.com/_/eclipse-temurin). [official Eclipse Temurin OpenJDK Docker images](https://hub.docker.com/_/eclipse-temurin).
The build pipeline pushes both JDK11 and JDK17 tags for Confluence versions ranging from 7.19 to 8.9.
Starting from 9.0 only JDK17 tags are published.
The Docker images follow the [Atlassian Support end-of-life The Docker images follow the [Atlassian Support end-of-life
policy](https://confluence.atlassian.com/support/atlassian-support-end-of-life-policy-201851003.html); policy](https://confluence.atlassian.com/support/atlassian-support-end-of-life-policy-201851003.html);
images for unsupported versions of the products remain available but will no longer images for unsupported versions of the products remain available but will no longer

48
bitbucket-pipelines.yml
View File

@ -38,7 +38,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -64,7 +64,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -90,7 +90,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -116,7 +116,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -142,7 +142,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -168,7 +168,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -194,7 +194,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -220,7 +220,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -495,7 +495,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -521,7 +521,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -547,7 +547,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -573,7 +573,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -599,7 +599,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -625,7 +625,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -651,7 +651,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -677,7 +677,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -904,7 +904,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -930,7 +930,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -956,7 +956,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -982,7 +982,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -1008,7 +1008,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -1034,7 +1034,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -1060,7 +1060,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -1086,7 +1086,7 @@ pipelines:
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='7.19' \ --start-version='7.19' \
--end-version='8.0' \ --end-version='9.0' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \

2
pipelines-generator.py
View File

@ -10,7 +10,7 @@ images = {
'Confluence': { 'Confluence': {
11: { 11: {
'start_version': '7.19', 'start_version': '7.19',
'end_version': '8.0', 'end_version': '9.0',
'default_release': True, 'default_release': True,
'base_image': 'eclipse-temurin:11', 'base_image': 'eclipse-temurin:11',
'tag_suffixes': ['jdk11','ubuntu-jdk11'], 'tag_suffixes': ['jdk11','ubuntu-jdk11'],