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-1909-pin-base-image-tag-to-ubuntu-noble (pull request #175)

Browse Source 
CLIP-1909: Pinned base image tag to Ubuntu noble.

* CLIP-1909: Pinned base image tag to Ubuntu noble.


Approved-by: Eugene Ivantsov
This commit is contained in:
Yifei Zhang 2024-07-30 07:50:38 +00:00
parent be37c311a8
commit fc4a43042c
3 changed files with 41 additions and 41 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:17
ARG BASE_IMAGE=eclipse-temurin:17-noble
FROM $BASE_IMAGE
LABEL maintainer="dc-deployments@atlassian.com"

72
bitbucket-pipelines.yml
View File

@ -43,7 +43,7 @@ pipelines:
--end-version='8.3' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -72,7 +72,7 @@ pipelines:
--end-version='8.3' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -101,7 +101,7 @@ pipelines:
--end-version='8.3' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -130,7 +130,7 @@ pipelines:
--end-version='8.3' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -159,7 +159,7 @@ pipelines:
--end-version='8.3' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -188,7 +188,7 @@ pipelines:
--end-version='8.3' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -217,7 +217,7 @@ pipelines:
--end-version='8.3' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -246,7 +246,7 @@ pipelines:
--end-version='8.3' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -274,7 +274,7 @@ pipelines:
--start-version='8.3' \
--end-version='9.0' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -302,7 +302,7 @@ pipelines:
--start-version='8.3' \
--end-version='9.0' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -330,7 +330,7 @@ pipelines:
--start-version='8.3' \
--end-version='9.0' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -358,7 +358,7 @@ pipelines:
--start-version='8.3' \
--end-version='9.0' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -386,7 +386,7 @@ pipelines:
--start-version='8.3' \
--end-version='9.0' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -414,7 +414,7 @@ pipelines:
--start-version='8.3' \
--end-version='9.0' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -442,7 +442,7 @@ pipelines:
--start-version='8.3' \
--end-version='9.0' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -470,7 +470,7 @@ pipelines:
--start-version='8.3' \
--end-version='9.0' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -499,7 +499,7 @@ pipelines:
--end-version='8.3' \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -528,7 +528,7 @@ pipelines:
--end-version='8.3' \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -557,7 +557,7 @@ pipelines:
--end-version='8.3' \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -586,7 +586,7 @@ pipelines:
--end-version='8.3' \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -615,7 +615,7 @@ pipelines:
--end-version='8.3' \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -644,7 +644,7 @@ pipelines:
--end-version='8.3' \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -673,7 +673,7 @@ pipelines:
--end-version='8.3' \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -702,7 +702,7 @@ pipelines:
--end-version='8.3' \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -731,7 +731,7 @@ pipelines:
--default-release \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -760,7 +760,7 @@ pipelines:
--default-release \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -789,7 +789,7 @@ pipelines:
--default-release \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -818,7 +818,7 @@ pipelines:
--default-release \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -847,7 +847,7 @@ pipelines:
--default-release \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -876,7 +876,7 @@ pipelines:
--default-release \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -905,7 +905,7 @@ pipelines:
--default-release \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -934,7 +934,7 @@ pipelines:
--default-release \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -1260,7 +1260,7 @@ pipelines:
--end-version='8.3' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -1289,7 +1289,7 @@ pipelines:
--start-version='8.3' \
--end-version='9.0' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
@ -1319,7 +1319,7 @@ pipelines:
--end-version='8.3' \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
@ -1349,7 +1349,7 @@ pipelines:
--default-release \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17-noble' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \

8
pipelines-generator.py
View File

@ -13,7 +13,7 @@ images = {
'end_version': '8.3',
'default_release': True,
'default_eap': False,
'base_image': 'eclipse-temurin:11',
'base_image': 'eclipse-temurin:11-noble',
'tag_suffixes': ['jdk11','ubuntu-jdk11'],
'dockerfile': 'Dockerfile',
'docker_repos': REPOS,
@ -23,7 +23,7 @@ images = {
'end_version': '9.0',
'default_release': False,
'default_eap': False,
'base_image': 'eclipse-temurin:11',
'base_image': 'eclipse-temurin:11-noble',
'tag_suffixes': ['jdk11','ubuntu-jdk11'],
'dockerfile': 'Dockerfile',
'docker_repos': REPOS,
@ -33,7 +33,7 @@ images = {
'end_version': '8.3',
'default_release': False,
'default_eap': True,
'base_image': 'eclipse-temurin:17',
'base_image': 'eclipse-temurin:17-noble',
'tag_suffixes': ['jdk17','ubuntu-jdk17'],
'dockerfile': 'Dockerfile',
'docker_repos': REPOS,
@ -42,7 +42,7 @@ images = {
'start_version': '8.3',
'default_release': True,
'default_eap': True,
'base_image': 'eclipse-temurin:17',
'base_image': 'eclipse-temurin:17-noble',
'tag_suffixes': ['jdk17','ubuntu-jdk17'],
'dockerfile': 'Dockerfile',
'docker_repos': REPOS,