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 CLIP-1847-support-jdk-17 (pull request #149)

Browse Source 
Stop bundling Java 11 with Confluence 8.x

* Stop bundling Java 11 with Confluence 8.x

* Update the latest 7.x lts


Approved-by: Yifei Zhang
Approved-by: Minh Tran
This commit is contained in:
Eugene Ivantsov 2024-01-23 03:25:13 +00:00
parent f175a34c01
commit ddfc0a93e0
3 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,4 +1,4 @@
ARG BASE_IMAGE=eclipse-temurin:11 ARG BASE_IMAGE=eclipse-temurin:17
FROM $BASE_IMAGE FROM $BASE_IMAGE
LABEL maintainer="dc-deployments@atlassian.com" LABEL maintainer="dc-deployments@atlassian.com"

72
bitbucket-pipelines.yml
View File

@ -37,7 +37,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -62,7 +63,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -87,7 +89,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -112,7 +115,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -137,7 +141,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -162,7 +167,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -187,7 +193,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -212,7 +219,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--update \ --update \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -478,7 +486,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -503,7 +512,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -528,7 +538,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -553,7 +564,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -578,7 +590,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -603,7 +616,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -628,7 +642,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -653,7 +668,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create \ --create \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -871,7 +887,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -896,7 +913,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -921,7 +939,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -946,7 +965,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -971,7 +991,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -996,7 +1017,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -1021,7 +1043,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
@ -1046,7 +1069,8 @@ pipelines:
- > - >
python /usr/src/app/make-releases.py \ python /usr/src/app/make-releases.py \
--create-eap \ --create-eap \
--start-version='7.11' \ --start-version='7.19' \
--end-version='8' \
--default-release \ --default-release \
--default-eap \ --default-eap \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \

3
pipelines-generator.py
View File

@ -9,7 +9,8 @@ REPOS = ['atlassian/confluence', 'atlassian/confluence-server']
images = { images = {
'Confluence': { 'Confluence': {
11: { 11: {
'start_version': '7.11', 'start_version': '7.19',
'end_version': '8',
'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'],