From a357108a68b4ddd0201326cdcf0728e259719a6f Mon Sep 17 00:00:00 2001
From: Vincent Massol <vincent@massol.net>
Date: Tue, 30 Nov 2021 16:30:40 +0100
Subject: [PATCH] [Misc] Use a better (more specific) tomcat image tag so that
 if tomcat changes the jdk version for tag "9", we won't be affected

---
 12/mysql-tomcat/Dockerfile    | 2 +-
 12/postgres-tomcat/Dockerfile | 2 +-
 13/mysql-tomcat/Dockerfile    | 2 +-
 13/postgres-tomcat/Dockerfile | 2 +-
 template/Dockerfile           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/12/mysql-tomcat/Dockerfile b/12/mysql-tomcat/Dockerfile
index 113f896..8fb7d85 100644
--- a/12/mysql-tomcat/Dockerfile
+++ b/12/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9
+FROM tomcat:9-jdk11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/12/postgres-tomcat/Dockerfile b/12/postgres-tomcat/Dockerfile
index 6ac9247..8bd5a70 100644
--- a/12/postgres-tomcat/Dockerfile
+++ b/12/postgres-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9
+FROM tomcat:9-jdk11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile
index b2d6d38..1cef3da 100644
--- a/13/mysql-tomcat/Dockerfile
+++ b/13/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9
+FROM tomcat:9-jdk11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/13/postgres-tomcat/Dockerfile b/13/postgres-tomcat/Dockerfile
index 182773a..78b00ab 100644
--- a/13/postgres-tomcat/Dockerfile
+++ b/13/postgres-tomcat/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9
+FROM tomcat:9-jdk11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
diff --git a/template/Dockerfile b/template/Dockerfile
index 80ef978..1472ff7 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -17,7 +17,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 # ---------------------------------------------------------------------------
-FROM tomcat:9
+FROM tomcat:9-jdk11
 
 #    ____  ____  ____      ____  _   __        _
 #   |_  _||_  _||_  _|    |_  _|(_) [  |  _   (_)
-- 
GitLab