From f2db32f90389c896b8a0a2df6cc4954e43240794 Mon Sep 17 00:00:00 2001
From: Steffen Bleul <sbl@itbleul.de>
Date: Mon, 7 Nov 2016 21:29:42 +0100
Subject: [PATCH] Fixes for confluence 6, port 8091 must be forwarded for
 websockets.

---
 Dockerfile         |  2 +-
 README.md          | 12 ++++++++----
 docker-compose.yml |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index eddcc9d..e6f9bb8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -80,7 +80,7 @@ RUN export CONTAINER_USER=confluence                &&  \
     rm -rf /var/log/*
 
 # Expose default HTTP connector port.
-EXPOSE 8090
+EXPOSE 8090 8091
 
 USER confluence
 VOLUME ["/var/atlassian/confluence"]
diff --git a/README.md b/README.md
index c2ce725..2b6f951 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ You may also like:
 # Make It Short
 
 ~~~~
-$ docker run -d -p 80:8090 --name confluence blacklabelops/confluence
+$ docker run -d -p 80:8090 -p 8091:8091 --name confluence blacklabelops/confluence
 ~~~~
 
 # Setup
@@ -52,7 +52,7 @@ Secondly start Confluence with a link to postgres:
 ~~~~
 $ docker run -d --name confluence \
 	  --link postgres:postgres \
-	  -p 80:8090 blacklabelops/confluence
+	  -p 80:8090 -p 8091:8091 blacklabelops/confluence
 ~~~~
 
 >  Start the Confluence and link it to the postgresql instance.
@@ -127,7 +127,7 @@ Now start the Confluence container and let it use the container. On first startu
 ~~~~
 $ docker run -d --name confluence \
 	  --link postgres:postgres \
-	  -p 80:8090 blacklabelops/confluence
+	  -p 80:8090 -p 8091:8091 blacklabelops/confluence
 ~~~~
 
 >  Start the Confluence and link it to the postgresql instance.
@@ -177,7 +177,7 @@ Now start the Confluence container and let it use the container. On first startu
 ~~~~
 $ docker run -d --name confluence \
 	  --link mysql:mysql \
-	  -p 80:8090 blacklabelops/confluence
+	  -p 80:8090 -p 8091:8091 blacklabelops/confluence
 ~~~~
 
 >  Start the Confluence and link it to the postgresql instance.
@@ -212,6 +212,8 @@ $ docker run -d --name confluence \
 
 # NGINX HTTP Proxy
 
+> Note: This section cannot be applied to Confluence 6. Work In Progress!
+
 This is an example on running Atlassian Confluence behind NGINX with 2 Docker commands!
 
 First start Confluence:
@@ -240,6 +242,8 @@ $ docker run -d \
 
 # NGINX HTTPS Proxy
 
+> Note: This section cannot be applied to Confluence 6. Work In Progress!
+
 This is an example on running Atlassian Confluence behind NGINX with 2 Docker commands!
 
 Note: This is a self-signed certificate! Trusted certificates by letsencrypt are supported. Documentation can be found here: [blacklabelops/nginx](https://github.com/blacklabelops/nginx)
diff --git a/docker-compose.yml b/docker-compose.yml
index 68331b9..37b831d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,7 @@ services:
       - confluencedata:/var/atlassian/confluence
     ports:
       - '80:8090'
+      - '8091:8091'
     environment:
       - 'CATALINA_OPTS= -Xms256m -Xmx1g'
       - 'CONFLUENCE_PROXY_NAME='