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 TFKUBE-407-add-support-dataset-restore (pull request #113)

Browse Source 
TFKUBE-407-add-support-dataset-restore

Approved-by: Jun Jeong
Approved-by: Nasser Ghazali-Beiklar
Approved-by: Minh Tran
This commit is contained in:
Adam Brokes 2022-04-07 01:31:12 +00:00
commit 1bd9f63754
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,9 +2,9 @@
<confluence-configuration> <confluence-configuration>
<setupStep>setupstart</setupStep> <setupStep>{{ atl_setup_step | default('setupstart') }}</setupStep>
<setupType>custom</setupType> <setupType>{{ atl_setup_type | default('custom') }}</setupType>
<buildNumber>0</buildNumber> <buildNumber>{{ atl_build_number | default('0') }}</buildNumber>
<properties> <properties>
<property name="confluence.database.connection.type">database-type-standard</property> <property name="confluence.database.connection.type">database-type-standard</property>
@ -76,5 +76,9 @@
<property name="confluence.webapp.context.path">/{{ atl_tomcat_contextpath }}</property> <property name="confluence.webapp.context.path">/{{ atl_tomcat_contextpath }}</property>
{% endif %} {% endif %}
{% if atl_snapshot_used is defined %}
<property name="hibernate.setup">true</property>
{% endif %}
</properties> </properties>
</confluence-configuration> </confluence-configuration>

17
tests/test_image.py
View File

@ -426,3 +426,20 @@ def test_jvm_fallback_fonts(docker_cli, image):
assert font.exists assert font.exists
assert font.is_symlink assert font.is_symlink
def test_confluence_xml_snapshot_properties(docker_cli, image, run_user):
environment = {
'ATL_SETUP_STEP': 'complete',
'ATL_SETUP_TYPE': 'clustersetup',
'ATL_BUILD_NUMBER': '8703',
'ATL_SNAPSHOT_USED': 'true',
}
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('.//setupStep')[0].text == "complete"
assert xml.findall('.//setupType')[0].text == "clustersetup"
assert xml.findall('.//buildNumber')[0].text == "8703"
assert xml.findall('.//property[@name="hibernate.setup"]')[0].text == "true"