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 issue/SCALE-33 (pull request #71)

Browse Source 
SCALE-33 Allow injection of license key via env var

Approved-by: Steve Smith
Approved-by: Dave Chevell
This commit is contained in:
Kenny MacLeod 2020-09-11 09:03:34 +00:00
commit e6f61fd2aa
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
__pycache__/ __pycache__/
Pipfile Pipfile
Pipfile.lock Pipfile.lock
.idea

4
README.md
View File

@ -161,6 +161,10 @@ Example:
The directory where [Lucene](https://lucene.apache.org/) search indexes should The directory where [Lucene](https://lucene.apache.org/) search indexes should
be stored. Defaults to `index` under the Confluence home directory. be stored. Defaults to `index` under the Confluence home directory.
* `ATL_LICENSE_KEY` (from Confluence 7.8 onwards)
The Confluence license string. Providing this will remove the need to supply it through the web startup screen.
## Database configuration ## Database configuration
It is optionally possible to configure the database from the environment, It is optionally possible to configure the database from the environment,

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

@ -66,5 +66,9 @@
{% endif %} {% endif %}
{% if atl_license_key is defined %}
<property name="atlassian.license.message">{{ atl_license_key }}</property>
{% endif %}
</properties> </properties>
</confluence-configuration> </confluence-configuration>

11
tests/test_image.py
View File

@ -305,6 +305,17 @@ def test_confluence_xml_cluster_tcp(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.name"]')[0].text == "atl_cluster_name"
assert xml.findall('.//property[@name="confluence.cluster.peers"]')[0].text == "1.1.1.1,99.99.99.99" assert xml.findall('.//property[@name="confluence.cluster.peers"]')[0].text == "1.1.1.1,99.99.99.99"
def test_confluence_xml_license(docker_cli, image, run_user):
environment = {
'ATL_LICENSE_KEY': 'mylicense',
}
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="atlassian.license.message"]')[0].text == "mylicense"
def test_java_in_run_user_path(docker_cli, image): def test_java_in_run_user_path(docker_cli, image):
RUN_USER = 'confluence' RUN_USER = 'confluence'
container = run_image(docker_cli, image) container = run_image(docker_cli, image)