Skip to content

Commit

Permalink
Fixes for confluence 6, port 8091 must be forwarded for websockets.
Browse files Browse the repository at this point in the history
  • Loading branch information
Steffen Bleul committed Nov 7, 2016
1 parent db4e3a6 commit f2db32f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ services:
- confluencedata:/var/atlassian/confluence
ports:
- '80:8090'
- '8091:8091'
environment:
- 'CATALINA_OPTS= -Xms256m -Xmx1g'
- 'CONFLUENCE_PROXY_NAME='
Expand Down

0 comments on commit f2db32f

Please sign in to comment.