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 remove-eap-steps (pull request #171)

Browse Source 
Remove redundant new-eap-block

* Remove redunand new-eap-block

* Fix typo


Approved-by: Yifei Zhang
This commit is contained in:
Eugene Ivantsov 2024-07-15 05:49:35 +00:00
parent f857e05752
commit 9881a41894
2 changed files with 8 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
bitbucket-pipelines.yml
View File

@ -1192,7 +1192,7 @@ pipelines:
custom:
######################################################################
# Custom: Do full release for each image flavour
# Custom: Find and build new releases
######################################################################
new-releases:
@ -1211,6 +1211,7 @@ pipelines:
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='7.19' \
--end-version='8.3' \
--default-release \
@ -1239,6 +1240,7 @@ pipelines:
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='8.3' \
--end-version='9.0' \
--dockerfile='Dockerfile' \
@ -1266,6 +1268,7 @@ pipelines:
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='8.0' \
--end-version='8.3' \
--default-eap \
@ -1294,6 +1297,7 @@ pipelines:
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='8.3' \
--default-release \
--default-eap \
@ -1322,6 +1326,7 @@ pipelines:
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='8.5.6' \
--dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
@ -1336,144 +1341,6 @@ pipelines:
--platforms=linux/amd64,linux/arm64
- step:
name: EAP JDK 11-default - Batch 1
services:
- docker
script:
- git submodule update --init --recursive
- for i in {1..3}; do echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin && break || sleep 5; done; if [ $? -ne 0 ]; then echo "Failed to login to container registry after 3 attempts" && exit 1; fi
- docker buildx create --name container --driver docker-container --use
- docker buildx ls
- >
python /usr/src/app/make-releases.py \
--create-eap \
--start-version='7.19' \
--end-version='8.3' \
--default-release \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \
--job-offset='0' \
--jobs-total='8' \
--docker-repos='atlassian/confluence' \
--push \
--platforms=linux/amd64,linux/arm64
- step:
name: EAP JDK 11 - Batch 1
services:
- docker
script:
- git submodule update --init --recursive
- for i in {1..3}; do echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin && break || sleep 5; done; if [ $? -ne 0 ]; then echo "Failed to login to container registry after 3 attempts" && exit 1; fi
- docker buildx create --name container --driver docker-container --use
- docker buildx ls
- >
python /usr/src/app/make-releases.py \
--create-eap \
--start-version='8.3' \
--end-version='9.0' \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:11' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk11,ubuntu-jdk11' \
--concurrent-builds='1' \
--job-offset='0' \
--jobs-total='8' \
--docker-repos='atlassian/confluence' \
--push \
--platforms=linux/amd64,linux/arm64
- step:
name: EAP JDK 17 - Batch 1
services:
- docker
script:
- git submodule update --init --recursive
- for i in {1..3}; do echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin && break || sleep 5; done; if [ $? -ne 0 ]; then echo "Failed to login to container registry after 3 attempts" && exit 1; fi
- docker buildx create --name container --driver docker-container --use
- docker buildx ls
- >
python /usr/src/app/make-releases.py \
--create-eap \
--start-version='8.0' \
--end-version='8.3' \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='0' \
--jobs-total='8' \
--docker-repos='atlassian/confluence' \
--push \
--platforms=linux/amd64,linux/arm64
- step:
name: EAP JDK 17-default - Batch 1
services:
- docker
script:
- git submodule update --init --recursive
- for i in {1..3}; do echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin && break || sleep 5; done; if [ $? -ne 0 ]; then echo "Failed to login to container registry after 3 attempts" && exit 1; fi
- docker buildx create --name container --driver docker-container --use
- docker buildx ls
- >
python /usr/src/app/make-releases.py \
--create-eap \
--start-version='8.3' \
--default-release \
--default-eap \
--dockerfile='Dockerfile' \
--dockerfile-buildargs='BASE_IMAGE=eclipse-temurin:17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='jdk17,ubuntu-jdk17' \
--concurrent-builds='1' \
--job-offset='0' \
--jobs-total='8' \
--docker-repos='atlassian/confluence' \
--push \
--platforms=linux/amd64,linux/arm64
- step:
name: EAP JDK 17-ubi - Batch 1
services:
- docker
script:
- git submodule update --init --recursive
- for i in {1..3}; do echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin && break || sleep 5; done; if [ $? -ne 0 ]; then echo "Failed to login to container registry after 3 attempts" && exit 1; fi
- docker buildx create --name container --driver docker-container --use
- docker buildx ls
- >
python /usr/src/app/make-releases.py \
--create-eap \
--start-version='8.5.6' \
--dockerfile='Dockerfile.ubi' \
--dockerfile-buildargs='BASE_IMAGE=registry.access.redhat.com/ubi9/openjdk-17' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='ubi9,ubi9-jdk17' \
--concurrent-builds='1' \
--job-offset='0' \
--jobs-total='8' \
--docker-repos='atlassian/confluence' \
--push \
--platforms=linux/amd64,linux/arm64
custom-release:
- variables:
- name: CONFLUENCE_VERSION

45
bitbucket-pipelines.yml.j2
View File

@ -137,7 +137,7 @@ pipelines:
custom:
######################################################################
# Custom: Do full release for each image flavour
# Custom: Find and build new releases
######################################################################
new-releases:
@ -159,6 +159,7 @@ pipelines:
- >
python /usr/src/app/make-releases.py \
--create \
--create-eap \
--start-version='{{ appdata.start_version }}' \
{% if appdata.end_version|length %}
--end-version='{{ appdata.end_version }}' \
@ -185,48 +186,6 @@ pipelines:
{% endfor %}
{% endfor %}
{% for (name, pdata) in images.items() %}
{% for (jdkver, appdata) in pdata.items() %}
{% for offset in range(0, 1) %}
- step:
name: EAP JDK {{ jdkver }} - Batch {{ offset + 1 }}
services:
- docker
script:
- git submodule update --init --recursive
- for i in {1..3}; do echo ${DOCKER_BOT_PASSWORD} | docker login ${DOCKER_REGISTRY} --username ${DOCKER_BOT_USERNAME} --password-stdin && break || sleep 5; done; if [ $? -ne 0 ]; then echo "Failed to login to container registry after 3 attempts" && exit 1; fi
- docker buildx create --name container --driver docker-container --use
- docker buildx ls
- >
python /usr/src/app/make-releases.py \
--create-eap \
--start-version='{{ appdata.start_version }}' \
{% if appdata.end_version|length %}
--end-version='{{ appdata.end_version }}' \
{% endif %}
{% if appdata.default_release %}
--default-release \
{% endif %}
{% if appdata.default_eap %}
--default-eap \
{% endif %}
--dockerfile='{{ appdata.dockerfile }}' \
--dockerfile-buildargs='BASE_IMAGE={{ appdata.base_image }}' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
--tag-suffixes='{{ appdata.tag_suffixes|join(',') }}' \
--concurrent-builds='1' \
--job-offset='{{ offset }}' \
--jobs-total='{{ batches }}' \
--docker-repos='{{ appdata.docker_repos|join(',') }}' \
--push \
--platforms=linux/amd64,linux/arm64
{% endfor %}
{% endfor %}
{% endfor %}
custom-release:
- variables:
- name: CONFLUENCE_VERSION