summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-02-15 11:40:41 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-02-15 11:40:41 +0000
commit6444eca2be63cdc11090b2634aaa3648b1079ca8 (patch)
tree40fd2dfe34e65e40c45183259efbccd4ad4ee852
parentbbf771faa3a3748552694c341a94f4a08403156f (diff)
parent9d4324e72972f364e9dd15307e4faf16f9ff259b (diff)
downloadgitlab-ce-6444eca2be63cdc11090b2634aaa3648b1079ca8.tar.gz
Merge branch 'patch-29' into 'master'
Added PlantUML server using docker See merge request gitlab-org/gitlab-ce!16880
-rw-r--r--doc/administration/integration/plantuml.md14
1 files changed, 13 insertions, 1 deletions
diff --git a/doc/administration/integration/plantuml.md b/doc/administration/integration/plantuml.md
index 65f59b72690..d978d1dca53 100644
--- a/doc/administration/integration/plantuml.md
+++ b/doc/administration/integration/plantuml.md
@@ -9,7 +9,19 @@ created in snippets, wikis, and repos.
## PlantUML Server
Before you can enable PlantUML in GitLab; you need to set up your own PlantUML
-server that will generate the diagrams. Installing and configuring your
+server that will generate the diagrams.
+
+### Docker
+
+With Docker, you can just run a container like this:
+
+`docker run -d --name plantuml -p 8080:8080 plantuml/plantuml-server:tomcat`
+
+The **PlantUML URL** will be the hostname of the server running the container.
+
+### Debian/Ubuntu
+
+Installing and configuring your
own PlantUML server is easy in Debian/Ubuntu distributions using Tomcat.
First you need to create a `plantuml.war` file from the source code: