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-1374-context-path-missing-in-confluence.cfg.xml (pull request #108)

Browse Source 
add context-path to confluence.cfg.xml

Approved-by: Nasser Ghazali-Beiklar
Approved-by: Efim Pyshnohraiev
This commit is contained in:
Will Yasvoin 2021-10-11 22:05:55 +00:00
commit 1ca6ff3499
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/confluence.cfg.xml.j2
View File

@ -72,5 +72,9 @@
<property name="atlassian.license.message">{{ atl_license_key }}</property>
{% endif %}
{% if atl_tomcat_contextpath is defined and atl_tomcat_contextpath != '' %}
<property name="confluence.webapp.context.path">/{{ atl_tomcat_contextpath }}</property>
{% endif %}
</properties>
</confluence-configuration>

10
tests/test_image.py
View File

@ -304,6 +304,16 @@ def test_confluence_xml_cluster_aws(docker_cli, image, run_user):
assert xml.findall('.//property[@name="confluence.cluster.name"]')[0].text == "atl_cluster_name"
assert xml.findall('.//property[@name="confluence.cluster.ttl"]')[0].text == "atl_cluster_ttl"
def test_confluence_xml_context_path(docker_cli, image, run_user):
environment = {
'ATL_TOMCAT_CONTEXTPATH': 'myconf',
}
container = run_image(docker_cli, image, user=run_user, environment=environment)
_jvm = wait_for_proc(container, get_bootstrap_proc(container))
xml = parse_xml(container, f'{get_app_home(container)}/confluence.cfg.xml')
assert xml.findall('.//property[@name="confluence.webapp.context.path"]')[0].text == "/myconf"
def test_confluence_xml_cluster_multicast(docker_cli, image, run_user):
environment = {