From 749cdfb7ab26b6931c24924c9508ceef74e439c5 Mon Sep 17 00:00:00 2001
From: John Jarvis <john@jarv.org>
Date: Mon, 16 Sep 2019 14:59:44 +0200
Subject: [PATCH 1/2] Revert "Tags the docker image if there is a git tag"

This reverts commit fffa69238cc2e3274540df9f46dc4c8df5f9a5b1.
---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e0ef2ae..79b69e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,10 +32,6 @@ jobs:
               - docker login  -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
               - docker build --pull -t plantuml/plantuml-server:jetty -f Dockerfile.jetty .
               - docker tag plantuml/plantuml-server:jetty plantuml/plantuml-server:latest
-              - if [ -n "$TRAVIS_TAG" ]; then
-                  docker tag plantuml/plantuml-server:jetty plantuml/plantuml-server:$TRAVIS_TAG;
-                  docker push plantuml/plantuml-server:$TRAVIS_TAG;
-                fi
               - docker push plantuml/plantuml-server:jetty
               - docker push plantuml/plantuml-server:latest
         - stage: docker-push

From 10707c4df79c6fbacabf7b1ecc7f3a19ccac7b69 Mon Sep 17 00:00:00 2001
From: John Jarvis <john@jarv.org>
Date: Mon, 16 Sep 2019 15:05:58 +0200
Subject: [PATCH 2/2] Create separate tags for jetty and tomcat

---
 .travis.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 79b69e4..a5abc62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,8 @@ services:
 
 stages:
   - build
+  - name: docker-tag
+    if: tag IS present
   - name: docker-push
     if: branch = master
 
@@ -26,6 +28,27 @@ jobs:
               skip_cleanup: true
               on:
                   tags: true
+
+        - stage: docker-tag
+          name: jetty
+          script:
+              - if [ -z "$TRAVIS_TAG" ]; then exit 0; fi
+              - docker login  -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
+              - docker build --pull -t plantuml/plantuml-server:jetty-$TRAVIS_TAG -f Dockerfile.jetty .
+              - docker push plantuml/plantuml-server:jetty-$TRAVIS_TAG
+          on:
+              tags: true
+
+        - stage: docker-tag
+          name: tomcat
+          script:
+              - if [ -z "$TRAVIS_TAG" ]; then exit 0; fi
+              - docker login  -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
+              - docker build --pull -t plantuml/plantuml-server:tomcat-$TRAVIS_TAG -f Dockerfile.tomcat .
+              - docker push plantuml/plantuml-server:tomcat-$TRAVIS_TAG
+          on:
+              tags: true
+
         - stage: docker-push
           name: jetty
           script: