Commit Graph

304 Commits

Author SHA1 Message Date
Steve Smith
3a29822bb9 DCD-545: Add seraph-config.xml configuration. 2019-08-08 10:48:07 +10:00
Steve Smith
e079baa776 DCD-545: Add generation of server.xml. 2019-08-08 09:24:08 +10:00
Steve Smith
4c01753833 DCD-545: Use TestInfra helpers to query docker image. 2019-08-06 14:57:51 +10:00
Steve Smith
00d24164db DCD-545: Import config templates from Ansible, and expand and normalise the two Dockerfiles with limited permissions. 2019-08-06 14:19:28 +10:00
Steve Smith
53d71a4ed1 DCD-545: Add incremental check for target process. 2019-08-06 12:27:21 +10:00
Steve Smith
b2febfa379 DCD-545: Import the templater script. 2019-08-06 09:01:08 +10:00
Dave Chevell
26d7047500 Merged in switch-to-master (pull request #37)
Switch to master

Approved-by: Steve Smith <ssmith@atlassian.com>
Approved-by: Minh Tran <mtran@atlassian.com>
2019-08-05 01:28:46 +00:00
Dave Chevell
fdcd9fce7a Run default release pipeline last 2019-08-03 21:19:19 +10:00
Dave Chevell
565930db97 Added tests 2019-08-02 15:25:58 +10:00
Dave Chevell
da0a14628e Merge ubuntu and alpine branches together 2019-08-02 14:52:43 +10:00
Dave Chevell
bf87ef75d1 Rename pipelines 2019-07-19 11:58:14 +10:00
Dave Chevell
9fe00bdf47 Merged in custom-releases-base-6-ubuntu (pull request #34)
Create custom releases.

Approved-by: Joe Xie <jxie@atlassian.com>
2019-07-03 04:28:34 +00:00
Dave Chevell
15fe202381 Reconfigure pipelines with custom release option 2019-06-25 17:32:40 -05:00
Dave Chevell
a596ac8674
Remove default version - must be specified at build time 2019-05-21 12:00:40 +10:00
Dave Chevell
382feb5719 Merged in update-pipelines-base-6-adoptopenjdk8 (pull request #33)
Updated docker release pipelines config

Approved-by: Minh Tran <mtran@atlassian.com>
2019-05-16 07:00:59 +00:00
Dave Chevell
3cc2669370
Updated docker release pipelines config 2019-05-16 15:56:50 +10:00
Dave Chevell
49959dc017
Merged in cleanup-base-6 (pull request #29)
Cleanup base 6

Approved-by: Joe Xie <jxie@atlassian.com>
2019-02-12 08:44:40 +11:00
Dave Chevell
9b7de70d4e
Updated pipelines configuration for new docker release maker 2019-02-08 16:42:31 +11:00
Dave Chevell
3dec230cd6
Removed redundany packages and tidied up formatting 2019-02-03 19:01:24 +11:00
Minh Tran
5fdad0eaea Merged in issue/CONFSRVDEV-8918-update-the-docker-documentation-for-adopt-openjdk (pull request #27)
Update confluence docker image to use Adopt OpenJDK

Approved-by: Rachel Robins <rrobins@atlassian.com>
Approved-by: Joe Xie <jxie@atlassian.com>
2018-11-28 06:46:37 +00:00
Minh Tran
b6ac6f58f4 CONFSRVDEV-8918 - Update wording as feedback 2018-11-28 02:44:03 +00:00
Minh Tran
f701d669f3 CONFSRVDEV-8918 - Update wording as feedback 2018-11-28 02:12:35 +00:00
Minh Tran
06c4049522 CONFSRVDEV-8918 - update the docker documentation for adopt openjdk 2018-11-28 12:37:14 +11:00
minhtran83
d5274a7137 Empty commit to trigger builds 2018-11-26 10:48:00 +11:00
minhtran83
d6c4710cc2 Empty commit to trigger builds 2018-11-26 10:19:22 +11:00
minhtran83
9d4272cbec Empty commit to trigger builds 2018-11-26 10:03:01 +11:00
Minh Tran
de207bbbbb Merged in isssue/CONFSRVDEV-8918-update-confluence-docker-image-use-adopt-openjdk (pull request #25)
CONFSRVDEV-8918 - Update confluence docker image to use Adopt OpenJDK

Approved-by: Joe Xie <jxie@atlassian.com>
Approved-by: Richard Atkins <richatkins@atlassian.com>
2018-11-23 02:01:04 +00:00
minhtran83
84c0581736 CONFSRVDEV-8918 - update tag prefix to ubuntu-18.04 2018-11-22 16:08:37 +11:00
minhtran83
2f09bd01a1 CONFSRVDEV-8918 - Make sure the adopt openjdk pipeline to create latest tag 2018-11-22 14:26:57 +11:00
Minh Tran
26cea7ca96 CONFSRVDEV-8918 - Update the TAG_SUFFIX and rename the base branches 2018-11-22 14:04:54 +11:00
Minh Tran
d50d4c012a CONFSRVDEV-8918 - Switching the base image from Alpine Linux to Ubuntu 2018-11-08 14:52:58 +11:00
Minh Tran
7faaa9df5c CONFSRVDEV-8918 - Using the implicit tag from adopt openjdk 2018-11-05 23:54:49 +11:00
Minh Tran
d99bfe5897 CONFSRVDEV-8918 - Address feedback 2018-11-05 23:48:52 +11:00
Minh Tran
bc4fe3dd2e CONFSRVDEV-8918 - Update confluence docker image to use Adopt OpenJDK 2018-11-05 19:39:14 +11:00
Dave Chevell
1f5f49e388 Merged in feature/set-context-path (pull request #24)
Add support for setting application context path from environment

Approved-by: Minh Tran <mtran@atlassian.com>
2018-10-16 03:08:40 +00:00
Dave Chevell
8f8e717361
Add support for setting application context path from environment 2018-10-12 10:44:05 +11:00
Rachel Robins
982cd9dc2c Minor change to wording of Oracle JDK requirement to match the documentation 2018-09-13 15:26:28 +10:00
Dave Chevell
37d9ecc3ad Merged in alpine-update (pull request #22)
Updated base image to openjdk:8-jdk-alpine

Approved-by: Joe Xie <jxie@atlassian.com>
2017-12-18 04:34:28 +00:00
Dave Chevell
f3c8443d59
Updated base image to openjdk:8-jdk-alpine, to be more explicit and because the font bug affecting captcha appears to be resolved in Alpine 3.7.0+ 2017-12-10 09:21:16 +11:00
jxie
1d4952cf53 Revert "add the shared home dir"
This reverts commit 2bce44d24a.
2017-11-09 17:33:09 +11:00
jxie
2bce44d24a add the shared home dir 2017-11-09 16:02:31 +11:00
Dave Chevell
526e1d5113
Merge conflict fix - resetting to earlier state and manually re-applying dragfly's libc6-compat fix 2017-10-19 18:12:34 +11:00
Dave Chevell
5b51b21a11
Enabled piplines support for automated docker releases 2017-10-10 13:24:57 +11:00
Dave Chevell
bd87e0018b
Updated README with instructions for reverse proxy and jvm environment variables 2017-08-29 21:14:34 +10:00
Dave Chevell
40d613955c
Cleaned up entrypoint.sh to export CATALINA_OPTS directly, as setenv.sh in Confluence will read the existing value here 2017-08-29 20:59:05 +10:00
Dave Chevell
6ee5182477
Added permissions check before re-applying permissions 2017-08-29 17:41:40 +10:00
Dave Chevell
ca78534396
Set -Dconfluence.home from environment variable 2017-08-26 09:23:04 +10:00
Dave Chevell
afdc6e9ff0
Added .dockerignore file 2017-08-26 08:52:52 +10:00
Dave Chevell
db7fed8ea6
Rebuild Dockerfile in alpine style with dedicated entrypoint script 2017-08-26 08:52:43 +10:00
Deployment Bamboo Bot
3803ee15f5 Update Dockerfile CONF_VERSION to 6.3.3 2017-08-16 04:48:29 +00:00