From dcc1b86298fbc1e72adab219e05732c975b9b749 Mon Sep 17 00:00:00 2001
From: Ducatel David <Ducatel@users.noreply.github.com>
Date: Tue, 25 Apr 2017 14:52:01 +0200
Subject: [PATCH 1/4] Update travis to automatically build docker image

---
 .travis.yml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f5c99a7..7b38b2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1 +1,16 @@
-language: java
\ No newline at end of file
+language: java
+
+sudo: required
+
+services:
+    - docker
+
+script:
+    - mvn package
+
+after_success:
+  - docker login  -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
+  - if [ "$TRAVIS_BRANCH" == "master" ]; then
+    docker build -t plantuml/plantuml-server:latest . ;
+    docker push plantuml/plantuml-server:latest;
+    fi

From 2278fb730902b336aa069df67c5dbe538bce4655 Mon Sep 17 00:00:00 2001
From: Ducatel David <Ducatel@users.noreply.github.com>
Date: Tue, 25 Apr 2017 14:53:23 +0200
Subject: [PATCH 2/4] Update docker file to use war builded by travis

---
 Dockerfile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index aa9ffe3..136b002 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,4 @@
-FROM maven:3-jdk-8
+FROM jetty
+MAINTAINER D.Ducatel
 
-RUN apt-get update && apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && rm -rf /var/lib/apt/lists/*
-ADD . /app
-WORKDIR /app
-EXPOSE 8080
-CMD ["mvn", "jetty:run"]
+ADD target/plantuml.war /var/lib/jetty/webapps/ROOT.war

From 78468f3ddd5372533e195ca80514c002534926c0 Mon Sep 17 00:00:00 2001
From: Ducatel David <Ducatel@users.noreply.github.com>
Date: Tue, 25 Apr 2017 14:55:02 +0200
Subject: [PATCH 3/4] Update readme on docker part

---
 README.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 962eedd..b6110cd 100644
--- a/README.md
+++ b/README.md
@@ -36,13 +36,10 @@ How to run the server with Docker
 =================================
 
 ```
-docker build -t plantuml-server .
-docker run -d -p 8080:8080 plantuml-server
+docker run -d -p 8080:8080 plantuml/plantuml-server
 ```
 
-The server is now listing to [http://localhost:8080/plantuml](http://localhost:8080/plantuml).
-
-You may specity the port in `-p` Docker command line argument.
+The server is now listing to [http://localhost:8080](http://localhost:8080).
 
 Alternate: How to run the server with Tomcat + Docker?
 ======================================================

From e43ffa1b4330ba2aadaa09347965c1803f807ce7 Mon Sep 17 00:00:00 2001
From: Ducatel David <Ducatel@users.noreply.github.com>
Date: Wed, 26 Apr 2017 22:32:53 +0200
Subject: [PATCH 4/4] Add dependency for asiatics font

---
 Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 136b002..68f077e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,8 @@
 FROM jetty
 MAINTAINER D.Ducatel
 
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \
+    rm -rf /var/lib/apt/lists/*
+
 ADD target/plantuml.war /var/lib/jetty/webapps/ROOT.war