From 06c4049522cec1a6f90e675e9f6ce0a97ed72c25 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Wed, 28 Nov 2018 01:34:43 +0000 Subject: [PATCH 1/3] CONFSRVDEV-8918 - update the docker documentation for adopt openjdk --- README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 969c54c..b6f8b4e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![Atlassian Confluence Server](https://www.atlassian.com/dam/wac/legacy/confluence_logo_landing.png) -Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence. +Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence. Learn more about Confluence Server: @@ -102,15 +102,19 @@ Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Con Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore) # Versioning - + The `latest` tag matches the most recent release of Atlassian Confluence Server. So `atlassian/confluence-server:latest` will use the newest stable version of Confluence Server available. Alternatively, you can use a specific minor version of Confluence Server by using a version number -tag: `atlassian/confluence-server:5.10`. This will install the latest `5.10.x` version that +tag: `atlassian/confluence-server:6.13`. This will install the latest `6.13.x` version that is available. -For the latest developer (EAP) release use `atlassian/confluence-server:eap`. This will install our latest milestone (not supported for use in production). +For the latest developer (EAP) release use `atlassian/confluence-server:eap`. This will install our latest milestone (not supported for use in production). + +Besides the docker image for OpenJDK, we also support docker images for Adopt OpenJDK. +Those are tagged with the suffix `ubuntu-18.04-adoptopenjdk8` together with Confluence versions. +For e.g: `atlassian/confluence-server:6.13-ubuntu-18.04-adoptopenjdk8`, this will install the latest `6.13.x` version together with latest version Adopt OpenJDK 8 # Known Problems In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error: From f701d669f3a0b4ea8c5d870e92b3f48252f75cfd Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Wed, 28 Nov 2018 02:12:35 +0000 Subject: [PATCH 2/3] CONFSRVDEV-8918 - Update wording as feedback --- README.md | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b6f8b4e..5ca8d9c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,12 @@ You can find the repository for this Dockerfile at Date: Wed, 28 Nov 2018 02:44:03 +0000 Subject: [PATCH 3/3] CONFSRVDEV-8918 - Update wording as feedback --- README.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 5ca8d9c..a5ee478 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,7 @@ You can find the repository for this Dockerfile at