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

DCKUBE-707: Update the OpenJDK base images to use the project repo, as the Docker "official" images are no longer updated.

Browse Source
This commit is contained in:
Steve Smith 2021-09-16 14:11:45 +10:00
parent fcf596759e
commit 51eae235d1
3 changed files with 26 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=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"

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,