From ae64a619b713b4d574967c1a7bbe318f8c6b1834 Mon Sep 17 00:00:00 2001
From: xiagw <fxiaxiaoyu@gmail.com>
Date: Sun, 25 Aug 2019 17:24:17 +0800
Subject: [PATCH] add tomcat

---
 docker-compose.yml | 17 ++++++++++++++++-
 env-example        |  4 ++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1a729e8..2d06b7f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1487,6 +1487,7 @@ services:
       networks:
         - backend
         - frontend
+
 ### CONFLUENCE ################################################
     confluence:
       container_name: Confluence
@@ -1500,4 +1501,18 @@ services:
       depends_on:
         - postgres
       volumes:
-        - ${DATA_PATH_HOST}/Confluence:/var/atlassian/application-data
\ No newline at end of file
+        - ${DATA_PATH_HOST}/Confluence:/var/atlassian/application-data
+
+### tomcat ####################################################
+    tomcat:
+      container_name: tomcat
+      image: tomcat:${TOMCAT_VERSION}
+      ports:
+        - "${TOMCAT_HOST_HTTP_PORT}:8080"
+      networks:
+        - frontend
+        - backend
+      volumes:
+        - ${DATA_PATH_HOST}/tomcat/webapps:/usr/local/tomcat/webapps
+        - ${DATA_PATH_HOST}/tomcat/logs:/usr/local/tomcat/logs
+      # restart: always
\ No newline at end of file
diff --git a/env-example b/env-example
index 6bc5a3f..cf0ab26 100644
--- a/env-example
+++ b/env-example
@@ -718,3 +718,7 @@ SONARQUBE_POSTGRES_HOST=postgres
 SONARQUBE_POSTGRES_DB=sonar
 SONARQUBE_POSTGRES_USER=sonar
 SONARQUBE_POSTGRES_PASSWORD=sonarPass
+
+### TOMCAT ################################################
+TOMCAT_VERSION=8.5.43
+TOMCAT_HOST_HTTP_PORT=8080