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 DCD-1253-fix-alpine (pull request #86)

Browse Source 
DCD-1253: Fix typo and missing flag for the target dockerfile.

Approved-by: Geoff Jacobs
Approved-by: Nasser Ghazali-Beiklar
This commit is contained in:
Steve Smith 2021-03-29 04:49:42 +00:00
commit ebb81ad5fb
3 changed files with 147 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

216
bitbucket-pipelines.yml
View File

File diff suppressed because it is too large Load Diff

2
bitbucket-pipelines.yml.j2
View File

@ -45,6 +45,7 @@ pipelines:
{% if appdata.default_release %}
--default-release \
{% endif %}
--dockerfile='{{ appdata.dockerfile }}' \
--dockerfile-buildargs='BASE_IMAGE={{ appdata.base_image }}' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \
@ -96,6 +97,7 @@ pipelines:
{% if appdata.default_release %}
--default-release \
{% endif %}
--dockerfile='{{ appdata.dockerfile }}' \
--dockerfile-buildargs='BASE_IMAGE={{ appdata.base_image }}' \
--dockerfile-version-arg='CONFLUENCE_VERSION' \
--mac-product-key='confluence' \

2
pipelines-generator.py
View File

@ -4,7 +4,7 @@ import os
import jinja2 as j2
TEMPLATE_FILE = 'bitbucket-pipelines.yml.j2'
REPOS = ['atlassian/confluence', 'atlassian/confluenec-servert']
REPOS = ['atlassian/confluence', 'atlassian/confluence-server']
images = {
'Confluence Alpine': {