Merged in CLIP-1866-fix-multiple-default-releases (pull request #158)

CLIP-1866: Add plain version tag to only one variant of jdk

Approved-by: Eugene Ivantsov
This commit is contained in:
Yifei Zhang 2024-04-16 06:35:32 +00:00
commit a309f75347
2 changed files with 1290 additions and 96 deletions

File diff suppressed because it is too large Load Diff

View File

@ -8,17 +8,35 @@ REPOS = ['atlassian/confluence']
images = { images = {
'Confluence': { 'Confluence': {
11: { "11-default": {
'start_version': '7.19', 'start_version': '7.19',
'end_version': '9.0', 'end_version': '8.3',
'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'],
'dockerfile': 'Dockerfile', 'dockerfile': 'Dockerfile',
'docker_repos': REPOS, 'docker_repos': REPOS,
}, },
11: {
'start_version': '8.3',
'end_version': '9.0',
'default_release': False,
'base_image': 'eclipse-temurin:11',
'tag_suffixes': ['jdk11','ubuntu-jdk11'],
'dockerfile': 'Dockerfile',
'docker_repos': REPOS,
},
17: { 17: {
'start_version': '8.0', 'start_version': '8.0',
'end_version': '8.3',
'default_release': False,
'base_image': 'eclipse-temurin:17',
'tag_suffixes': ['jdk17','ubuntu-jdk17'],
'dockerfile': 'Dockerfile',
'docker_repos': REPOS,
},
"17-default": {
'start_version': '8.3',
'default_release': True, 'default_release': True,
'base_image': 'eclipse-temurin:17', 'base_image': 'eclipse-temurin:17',
'tag_suffixes': ['jdk17','ubuntu-jdk17'], 'tag_suffixes': ['jdk17','ubuntu-jdk17'],
@ -27,7 +45,7 @@ images = {
}, },
"17-ubi": { "17-ubi": {
'start_version': '8.5.6', 'start_version': '8.5.6',
'default_release': True, 'default_release': False,
'base_image': 'registry.access.redhat.com/ubi9/openjdk-17', 'base_image': 'registry.access.redhat.com/ubi9/openjdk-17',
'tag_suffixes': ['ubi9','ubi9-jdk17'], 'tag_suffixes': ['ubi9','ubi9-jdk17'],
'dockerfile': 'Dockerfile.ubi', 'dockerfile': 'Dockerfile.ubi',