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 DCKUBE-707-deprecate-jdk8 (pull request #106)

Browse Source 
DCKUBE-707: Deprecate JDK8

Approved-by: Nasser Ghazali-Beiklar
Approved-by: Minh Tran
Approved-by: Adam Brokes
This commit is contained in:
Steve Smith 2021-09-24 03:39:38 +00:00
commit 385f460041
4 changed files with 47 additions and 31 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=adoptopenjdk:11-hotspot ARG BASE_IMAGE=adoptopenjdk/openjdk11
FROM $BASE_IMAGE FROM $BASE_IMAGE
LABEL maintainer="dc-deployments@atlassian.com" LABEL maintainer="dc-deployments@atlassian.com"

26
README.md
View File

@ -418,6 +418,24 @@ For example to get the `7.8.0-beta1` EAP release, use `atlassian/confluence:7.8.
For example, `atlassian/confluence:6.13-ubuntu-18.04-adoptopenjdk8` will For example, `atlassian/confluence:6.13-ubuntu-18.04-adoptopenjdk8` will
install the latest 6.13.x version with AdoptOpenJDK 8. install the latest 6.13.x version with AdoptOpenJDK 8.
# Supported JDK versions
All the Atlassian Docker images are now JDK11 only, and generated from the
[official AdoptOpenJDK Docker images](https://hub.docker.com/r/adoptopenjdk/openjdk11).
The Docker images follow the [Atlassian Support end-of-life
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
receive updates or fixes.
Historically, we have also generated other versions of the images, including
JDK8, Alpine, and 'slim' versions of the JDK. These legacy images still exist in
Docker Hub, however they should be considered deprecated, and do not receive
updates or fixes.
If for some reason you need a different version, see "Building your own image"
above.
# Troubleshooting # Troubleshooting
These images include built-in scripts to assist in performing common JVM diagnostic tasks. These images include built-in scripts to assist in performing common JVM diagnostic tasks.
@ -462,11 +480,9 @@ in the running container:
For product support, go to For product support, go to
[support.atlassian.com](https://support.atlassian.com/confluence-server/). [support.atlassian.com](https://support.atlassian.com/confluence-server/).
Note that these images are built on the [AdoptOpenJDK](https://adoptopenjdk.net/) images. Prior to You can also visit the [Atlassian Data Center on
Confluence 6.13 OpenJDK was not a supported platform. See [the 6.13 Kubernetes](https://community.atlassian.com/t5/Atlassian-Data-Center-on/gh-p/DC_Kubernetes)
release-notes][12] for more information. forum for discussion on running Atlassian Data Center products in containers.
Alpine builds are available for Confluence 6.x releases, however they are no longer supported.
# Contribution # Contribution

48
bitbucket-pipelines.yml
View File

@ -41,7 +41,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -66,7 +66,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -91,7 +91,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -116,7 +116,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -141,7 +141,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -166,7 +166,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -191,7 +191,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -216,7 +216,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -241,7 +241,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -266,7 +266,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -291,7 +291,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -316,7 +316,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -403,7 +403,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -429,7 +429,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -455,7 +455,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -481,7 +481,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -507,7 +507,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -533,7 +533,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -559,7 +559,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -585,7 +585,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -611,7 +611,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -637,7 +637,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -663,7 +663,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \
@ -689,7 +689,7 @@ pipelines:
--end-version='8' \ --end-version='8' \
--default-release \ --default-release \
--dockerfile='Dockerfile' \ --dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=adoptopenjdk:11-hotspot' \ --dockerfile-buildargs='BASE_IMAGE=adoptopenjdk/openjdk11' \
--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='adoptopenjdk11,jdk11,ubuntu,ubuntu-18.04-adoptopenjdk11' \

2
pipelines-generator.py
View File

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