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

DCD-545: Fixes and tweaks from PR.

Browse Source
This commit is contained in:
Steve Smith 2019-08-13 15:23:16 +10:00
parent 77bf60c9be
commit afb5bf3d86
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -165,7 +165,7 @@ This docker image can be run as part of a
[Data Center](https://confluence.atlassian.com/doc/confluence-data-center-technical-overview-790795847.html) [Data Center](https://confluence.atlassian.com/doc/confluence-data-center-technical-overview-790795847.html)
cluster. You can specify the following properties to start Confluence as a Data Center cluster. You can specify the following properties to start Confluence as a Data Center
node, instead of manually configuring a cluster. See node, instead of manually configuring a cluster. See
[Installing Jira Data Center](https://confluence.atlassian.com/doc/installing-confluence-data-center-203603.html) [Installing Confluence Data Center](https://confluence.atlassian.com/doc/installing-confluence-data-center-203603.html)
for more information. for more information.
### Cluster configuration ### Cluster configuration
@ -271,11 +271,6 @@ For the latest developer (EAP) release use
`atlassian/confluence-server:eap`. This will install our latest milestone (not `atlassian/confluence-server:eap`. This will install our latest milestone (not
supported for use in production). supported for use in production).
By default our Docker image uses OpenJDK, which is not supported for production
sites. However we do provide a fully supported Docker image that uses
AdoptOpenJDK 8. These images are tagged with the suffix
`ubuntu-18.04-adoptopenjdk8` together with the Confluence version.
For example, `atlassian/confluence-server:6.13-ubuntu-18.04-adoptopenjdk8` will For example, `atlassian/confluence-server:6.13-ubuntu-18.04-adoptopenjdk8` will
install the latest 6.13.x version with AdoptOpenJDK 8. install the latest 6.13.x version with AdoptOpenJDK 8.

4
tests/test_image.py
View File

@ -141,9 +141,9 @@ def test_server_xml_params(docker_cli, image):
'ATL_TOMCAT_ACCEPTCOUNT': '11', 'ATL_TOMCAT_ACCEPTCOUNT': '11',
'ATL_TOMCAT_SECURE': 'true', 'ATL_TOMCAT_SECURE': 'true',
'ATL_TOMCAT_SCHEME': 'https', 'ATL_TOMCAT_SCHEME': 'https',
'ATL_PROXY_NAME': 'jira.atlassian.com', 'ATL_PROXY_NAME': 'conf.atlassian.com',
'ATL_PROXY_PORT': '443', 'ATL_PROXY_PORT': '443',
'ATL_TOMCAT_CONTEXTPATH': '/myjira', 'ATL_TOMCAT_CONTEXTPATH': '/myconf',
} }
container = run_image(docker_cli, image, environment=environment) container = run_image(docker_cli, image, environment=environment)
_jvm = wait_for_proc(container, "org.apache.catalina.startup.Bootstrap") _jvm = wait_for_proc(container, "org.apache.catalina.startup.Bootstrap")