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 update-base-image (pull request #120)

Browse Source 
Switch from deprecated adoptopenjdk to eclipse-temurin jdk

Approved-by: Kenny MacLeod
Approved-by: Nasser Ghazali-Beiklar
Approved-by: Minh Tran
Approved-by: Adam Brokes
Approved-by: Dylan Rathbone
This commit is contained in:
Dave Chevell 2022-06-22 07:31:15 +00:00 committed by Nasser Ghazali-Beiklar
commit 0ab6e88877
3 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -423,20 +423,20 @@ So `atlassian/confluence:latest` will use the newest stable version of
Confluence Server available. Confluence Server available.
Alternatively, you can use a specific minor version of Confluence Server by Alternatively, you can use a specific minor version of Confluence Server by
using a version number tag: `atlassian/confluence:6.13`. This will using a version number tag: `atlassian/confluence:7.13`. This will
install the latest `6.13.x` version that is available. install the latest `7.13.x` version that is available.
We also publish docker images for our [EAP releases](https://www.atlassian.com/software/confluence/download-eap) (not We also publish docker images for our [EAP releases](https://www.atlassian.com/software/confluence/download-eap) (not
supported for use in production). The tag for EAP releases is the EAP version. supported for use in production). The tag for EAP releases is the EAP version.
For example to get the `7.8.0-beta1` EAP release, use `atlassian/confluence:7.8.0-beta1`. For example to get the `7.8.0-beta1` EAP release, use `atlassian/confluence:7.8.0-beta1`.
For example, `atlassian/confluence:6.13-ubuntu-18.04-adoptopenjdk8` will For example, `atlassian/confluence:7.13-ubuntu-jdk11` will
install the latest 6.13.x version with AdoptOpenJDK 8. 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 now JDK11 only, and generated from the
[official AdoptOpenJDK Docker images](https://hub.docker.com/r/adoptopenjdk/openjdk11). [official Eclipse Temurin OpenJDK Docker images](https://hub.docker.com/_/eclipse-temurin).
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);

64
bitbucket-pipelines.yml
View File

@ -41,10 +41,10 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \ --mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \ --concurrent-builds='1' \
--job-offset='0' \ --job-offset='0' \
--jobs-total='8' \ --jobs-total='8' \
@ -66,10 +66,10 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \ --mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \ --concurrent-builds='1' \
--job-offset='1' \ --job-offset='1' \
--jobs-total='8' \ --jobs-total='8' \
@ -91,10 +91,10 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \ --mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \ --concurrent-builds='1' \
--job-offset='2' \ --job-offset='2' \
--jobs-total='8' \ --jobs-total='8' \
@ -116,10 +116,10 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \ --mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \ --concurrent-builds='1' \
--job-offset='3' \ --job-offset='3' \
--jobs-total='8' \ --jobs-total='8' \
@ -141,10 +141,10 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \ --mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \ --concurrent-builds='1' \
--job-offset='4' \ --job-offset='4' \
--jobs-total='8' \ --jobs-total='8' \
@ -166,10 +166,10 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \ --mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \ --concurrent-builds='1' \
--job-offset='5' \ --job-offset='5' \
--jobs-total='8' \ --jobs-total='8' \
@ -191,10 +191,10 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \ --mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \ --concurrent-builds='1' \
--job-offset='6' \ --job-offset='6' \
--jobs-total='8' \ --jobs-total='8' \
@ -216,10 +216,10 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \ --mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \ --concurrent-builds='1' \
--job-offset='7' \ --job-offset='7' \
--jobs-total='8' \ --jobs-total='8' \
@ -291,10 +291,10 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \ --mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \ --concurrent-builds='1' \
--job-offset='0' \ --job-offset='0' \
--jobs-total='8' \ --jobs-total='8' \
@ -317,10 +317,10 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \ --mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \ --concurrent-builds='1' \
--job-offset='1' \ --job-offset='1' \
--jobs-total='8' \ --jobs-total='8' \
@ -343,10 +343,10 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \ --mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \ --concurrent-builds='1' \
--job-offset='2' \ --job-offset='2' \
--jobs-total='8' \ --jobs-total='8' \
@ -369,10 +369,10 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \ --mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \ --concurrent-builds='1' \
--job-offset='3' \ --job-offset='3' \
--jobs-total='8' \ --jobs-total='8' \
@ -395,10 +395,10 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \ --mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \ --concurrent-builds='1' \
--job-offset='4' \ --job-offset='4' \
--jobs-total='8' \ --jobs-total='8' \
@ -421,10 +421,10 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \ --mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \ --concurrent-builds='1' \
--job-offset='5' \ --job-offset='5' \
--jobs-total='8' \ --jobs-total='8' \
@ -447,10 +447,10 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \ --mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \ --concurrent-builds='1' \
--job-offset='6' \ --job-offset='6' \
--jobs-total='8' \ --jobs-total='8' \
@ -473,10 +473,10 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \ --dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \ --dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \ --mac-product-key='confluence' \
--tag-suffixes='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \ --tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \ --concurrent-builds='1' \
--job-offset='7' \ --job-offset='7' \
--jobs-total='8' \ --jobs-total='8' \

4
pipelines-generator.py
View File

@ -12,8 +12,8 @@ images = {
'start_version': '7.4', 'start_version': '7.4',
'end_version': '8', 'end_version': '8',
'default_release': True, 'default_release': True,
'base_image': 'adoptopenjdk/openjdk11', 'base_image': 'eclipse-temurin:11',
'tag_suffixes': ['adoptopenjdk11', 'jdk11', 'ubuntu', 'ubuntu-18.04-adoptopenjdk11'], 'tag_suffixes': ['jdk11','ubuntu-jdk11'],
'dockerfile': 'Dockerfile', 'dockerfile': 'Dockerfile',
'docker_repos': REPOS, 'docker_repos': REPOS,
} }