Commit Graph

288 Commits

Author SHA1 Message Date
Ben Partridge
7558c08b87 Merged in no-issue-remove-eap-latest-tag-docs (pull request #72)
Update documentation and remove untrue statement about building eap tag for newest EAP

Approved-by: Dave Chevell
2020-09-21 07:24:56 +00:00
Ben Partridge
6dcad651f7
Update documentation and remove untrue statement about building eap tag for newest EAP 2020-09-21 16:59:04 +10:00
Kenny MacLeod
e6f61fd2aa Merged in issue/SCALE-33 (pull request #71)
SCALE-33 Allow injection of license key via env var

Approved-by: Steve Smith
Approved-by: Dave Chevell
2020-09-11 09:03:34 +00:00
Kenny MacLeod
f2bd04b277
SCALE-33 Document new env var in README.md 2020-09-10 20:29:39 +01:00
Kenny MacLeod
78af588f71 Merged master into issue/SCALE-33 2020-09-06 19:39:49 +00:00
Kenny MacLeod
10167db66d
SCALE-33 Add atl_license_key support to template 2020-09-06 20:32:51 +01:00
Kenny MacLeod
cdb5bb2d76
SCALE-33 Add unit test first 2020-09-06 20:23:42 +01:00
Kenny MacLeod
cd5284a185
SCALE-33 Add .idea to .gitignore 2020-09-06 20:23:19 +01:00
Docker Bot
cb9ec5a6b1 Merged in update-shared-components (pull request #70)
Update shared components

Approved-by: Steve Smith
Approved-by: Dave Chevell
2020-08-25 05:57:46 +00:00
Steve Smith
01d3f5c3b9 Merged in DCD-1086-jvm-fallback-fonts (pull request #69)
DCD-1086: Add Google Noto fonts and install as JVM fallback for server-side rendering of non-Latin languages.

Approved-by: Adam Brokes
Approved-by: Dave Chevell
2020-08-25 03:04:29 +00:00
Steve Smith
29289ac63e DCD-1086: Try timeoutincrease. 2020-08-25 10:44:55 +10:00
Steve Smith
49890f0225 DCD-1086: Don't check link location as it's platform-specific. 2020-08-25 09:34:48 +10:00
Steve Smith
8bed033516 DCD-1086: We need to fetch & clean the cache to get all the fonts. 2020-08-25 09:34:48 +10:00
Steve Smith
2a44a5f82b DCD-1086: See need to all the Noto sub-packages too. 2020-08-25 09:34:48 +10:00
Steve Smith
12bbe6b36e DCD-1086: Add Noto fonts to Alpine too. 2020-08-25 09:34:48 +10:00
Steve Smith
e6204bab7a DCD-1086: Add Google Noto fonts and install as JVM fallback for server-side rendering of non-Latin languages. 2020-08-25 09:34:48 +10:00
Dave Chevell
284acb9a30 Merged in dont-write-bytecode (pull request #67)
SCALE-31: Don't write python bytecode

Approved-by: Kenny MacLeod
Approved-by: Steve Smith
Approved-by: Minh Tran
2020-08-24 07:14:13 +00:00
Atlassian Docker Bot
49fde15797 Update shared components 2020-08-24 03:52:42 +00:00
Steve Smith
65a83b38cb Merged in DCD-1053-lucene-dir-setting (pull request #68)
DCD-1053: Add ability to specify the Lucene index directory.

Approved-by: Ben Partridge
Approved-by: Minh Tran
2020-08-19 01:01:25 +00:00
Steve Smith
359f56dd4d DCD-1053: Add ability to specify the Lucene index directory. 2020-08-18 11:06:26 +10:00
Dave Chevell
edc980d70a Don't write python bytecode 2020-08-16 21:19:43 +10:00
Dave Chevell
4b22953bb7 Merged in jvm-support-args-precedence (pull request #66)
SCALE-18: Fix precedence of JVM_SUPPORT_RECOMMENDED_ARGS

Approved-by: Ben Partridge <bpartridge@atlassian.com>
Approved-by: Lauretha Rura <lrura@atlassian.com>
2020-06-01 03:57:34 +00:00
Dave Chevell
450cd06bfb
Move JVM_SUPPORT_RECOMMENDED_ARGS to the end 2020-05-30 15:47:47 +10:00
Dave Chevell
832a0f4264 Merged in SCALE-16-fix-mysql-instructions (pull request #65)
SCALE-16: Fix incorrect MySQL driver path in README [skip ci]

Approved-by: Minh Tran <mtran@atlassian.com>
2020-05-06 05:54:26 +00:00
Dave Chevell
ec457cb905
Fix incorrecty MySQL driver path in README 2020-05-06 11:46:23 +10:00
Dave Chevell
5a31b8ee44 Merged in publish-eap-releases (pull request #64)
Enable publishing EAP releases [skip ci]

Approved-by: Minh Tran <mtran@atlassian.com>
2020-04-22 04:33:55 +00:00
Dave Chevell
72d23763f6
Enable publishing EAP releases 2020-04-22 11:25:48 +10:00
Steve Smith
d4ca94a4d7 Merged in SCALE-4-full-jdk (pull request #63)
SCALE-4: Use full-JDK, as slim versions is missing jars required for some plugins, and be exlicit about Alpine version in pipelines.

Approved-by: Dave Chevell <dchevell@atlassian.com>
2020-03-23 04:26:12 +00:00
Steve Smith
99745a66a1 SCALE-4: Remove addition of explicit JDK 8 image for Alpine builds. 2020-03-23 15:25:43 +11:00
Docker Bot
4942a5d610 [skip ci] Merged in update-shared-components (pull request #62)
Update shared components

Approved-by: Dave Chevell <dchevell@atlassian.com>
2020-03-23 04:07:28 +00:00
Steve Smith
b50be4b64d SCALE-4: Use full-JDK, as slim versions is missing jars required for some plugins, and be exlicit about Alpine version in pipelines. 2020-03-23 14:34:48 +11:00
Atlassian Docker Bot
0ad5a18370 Update shared components 2020-03-23 03:01:13 +00:00
Dave Chevell
9dd976acaf Merged in maxhttpheadersize (pull request #61)
CONFSERVER-59318: Allow setting maxHttpHeaderSize

Approved-by: Ben Partridge <bpartridge@atlassian.com>
2020-03-18 23:42:09 +00:00
Dave Chevell
195cd45189
CONFSERVER-59318: Allow setting maxHttpHeaderSize 2020-03-18 18:06:22 +11:00
Steve Smith
f99edfada3 Merged in forked-contributions-target (pull request #60)
Contributions from Karolis Eigelis

Approved-by: Karolis Eigelis
Approved-by: Dave Chevell
2020-03-04 00:08:57 +00:00
Dave Chevell
4bebf05a1e
Tidying up 2020-03-04 09:37:04 +11:00
Ben Partridge
f9817df395 Add contributing guidelines to README 2020-03-03 16:34:39 +11:00
Ben Partridge
1247e1abdb Fix xml access log test using incorrect path to server.xml and running
as confluence user
2020-03-03 16:29:09 +11:00
Steve Smith
ec4b4bcc45 Add README entry about new setting and misc. formatting cleanups. 2020-02-28 14:30:20 +11:00
Karolis Eigelis
6aea6a1cb4 Merged in keigelis/docker-atlassian-confluence-server/add_confluence_caccess_log (pull request #59)
Add confluence caccess log
2020-02-28 03:17:24 +00:00
Karolis Eigelis
a5237d8ed4 align with the other tomcat configuration environment variables 2020-02-26 10:12:18 +02:00
Karolis Eigelis
3dff504b32 adding ATL_ACCESS_LOG flag 2020-02-21 14:24:46 +02:00
Karolis Eigelis
6dadcddc80 adding confluence access log 2020-02-20 23:28:11 +02:00
Karolis Eigelis
4ed0ef391e Initial Bitbucket Pipelines configuration 2020-02-19 13:30:35 +00:00
Dave Chevell
55f965b1aa Merged in fork-pr-target (pull request #57)
docker: read the ReservedCodeCacheSize from the env

Approved-by: Dave Chevell <dchevell@atlassian.com>
Approved-by: Ben Partridge <bpartridge@atlassian.com>
2020-02-18 05:46:45 +00:00
Yoan Blanc
8c4ef73600 Merged in greut/docker-atlassian-confluence-server/jvm-reserved-code-cache-size (pull request #56)
docker: read the ReservedCodeCacheSize from the env

Approved-by: Martin Zeller <martin.zeller@post.ch>
Approved-by: Yoan Blanc <yoan@dosimple.ch>
2020-02-17 21:26:43 +00:00
Yoan Blanc
3162d284a4
docker: XX:ReservedCodeCacheSize for alpine too
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
2020-02-11 10:35:38 +01:00
Yoan Blanc
2aab7496c3
fixup! test: JVM_RESERVED_CODE_CACHE_SIZE env
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
2020-02-07 15:15:42 +01:00
Yoan Blanc
5baee79ee2
test: JVM_RESERVED_CODE_CACHE_SIZE env
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
2020-02-07 09:03:25 +01:00
Yoan Blanc
05228aa72c
fixup! fixup! jvm: set a var for XX:ReservedCodeCacheSize
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
2020-02-06 12:43:20 +01:00