Commit Graph

311 Commits

Author SHA1 Message Date
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
Yoan Blanc
3dffa2be82
fixup! jvm: set a var for XX:ReservedCodeCacheSize
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
2020-02-06 11:08:07 +01:00
Yoan Blanc
12b2f18a0b
jvm: set a var for XX:ReservedCodeCacheSize
Signed-off-by: Yoan Blanc <yoan@dosimple.ch>
2020-02-06 10:42:48 +01:00
Steve Smith
c98f068810 Merged in DCD-914-update-support-notes (pull request #55)
DCD-914: Remove scary support message and link to SAC.

Approved-by: Adam Brokes <abrokes@atlassian.com>
Approved-by: Dave Chevell <dchevell@atlassian.com>
2020-02-06 02:15:58 +00:00
Steve Smith
ef88b87cc5 DCD-914: Use confluence support link. 2020-02-06 12:58:22 +11:00
Steve Smith
42e82e5f83 DCD-914: Clean up unused link. 2020-02-05 14:32:28 +11:00
Steve Smith
06585f8a66 DCD-914: Remove scary support message and link to SAC. 2020-02-05 11:46:37 +11:00
Docker Bot
683f721d25 Merged in update-shared-components (pull request #54)
Update shared components

Approved-by: Dave Chevell <dchevell@atlassian.com>
Approved-by: Steve Smith <ssmith@atlassian.com>
2020-01-28 02:49:47 +00:00
Atlassian Docker Bot
ab07a28ecf Update shared components 2020-01-24 20:31:11 +00:00
Dave Chevell
6064ff0e0e Merged in apt-get-upgrade (pull request #53)
Upgrade default packages as part of build

Approved-by: Ben Partridge <bpartridge@atlassian.com>
2020-01-13 03:38:24 +00:00
Dave Chevell
a3d772c848
Upgrade default packages as part of build 2020-01-13 13:29:55 +11:00
Dave Chevell
d9918364b8
[skip ci] Update logo 2019-12-01 17:52:27 +11:00
Docker Bot
ea51cbdf85
Merged in update-shared-components (pull request #51)
Update shared components

Approved-by: Dave Chevell <dchevell@atlassian.com>
Approved-by: Minh Tran <mtran@atlassian.com>
Approved-by: Ben Partridge <bpartridge@atlassian.com>
2019-11-29 13:55:48 +11:00
Atlassian Docker Bot
0e32b83af6 Update shared components 2019-11-28 02:10:19 +00:00
Dave Chevell
e1e75bde3e
[skip ci] Build in parallel 2019-11-26 15:21:35 +11:00
Dave Chevell
31f3bb1e1e Merged in shared-components (pull request #48)
Integrate docker shared components

Approved-by: Steve Smith <ssmith@atlassian.com>
2019-11-22 05:11:01 +00:00
Dave Chevell
990fe4d0d5
Increase pipelines memory 2019-11-21 10:46:15 +11:00
Dave Chevell
f165fd0f58
Update pipelines with git submodule support & new test configuration 2019-11-21 08:15:10 +11:00
Dave Chevell
14656dcb6c
Update all tests with shared fixtures and improved helpers 2019-11-20 21:32:21 +11:00
Dave Chevell
423e1acd66
Remove unused / old files 2019-11-20 20:55:26 +11:00
Dave Chevell
a07beb781b
Update documentation with Troubleshooting tools etc 2019-11-20 20:54:20 +11:00
Dave Chevell
90e0a7f7b9
Integrate shared components in Docker build 2019-11-20 20:54:04 +11:00
Dave Chevell
0548cc13b4 Merged in jdk11 (pull request #47)
Ship JDK11 from 7.1+

Approved-by: Minh Tran <mtran@atlassian.com>
Approved-by: Steve Smith <ssmith@atlassian.com>
2019-11-18 01:44:06 +00:00
Dave Chevell
6a6c35c704
Switched base to adoptopenjdk:11-hotspot 2019-11-18 09:30:10 +11:00
Dave Chevell
e12b182290
Build on JDK 11 from 7.1+ 2019-10-17 11:02:49 +11:00
Dave Chevell
3618c2d825
Default base image to jdk11 2019-10-17 10:55:54 +11:00
Dave Chevell
84d6dee89e Merged in build-7x (pull request #46)
Extend valid builds to include new 7.x major release

Approved-by: Steve Smith <ssmith@atlassian.com>
2019-09-10 01:37:53 +00:00
Dave Chevell
21d82594e7
Extend valid builds to include new 7.x major release 2019-09-10 11:10:53 +10:00