From 71bfe823c7f2759c8a220e31534be20d30976537 Mon Sep 17 00:00:00 2001 From: Vincent Massol <vincent@massol.net> Date: Thu, 27 Jun 2019 10:22:29 +0200 Subject: [PATCH] XDOCKER-112: Switch to Tomcat on Oracle JDK 8.x to AdoptOpenJDK 11.x --- 10/mysql-tomcat/Dockerfile | 2 +- 10/postgres-tomcat/Dockerfile | 2 +- 11/mysql-tomcat/Dockerfile | 2 +- 11/postgres-tomcat/Dockerfile | 2 +- template/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/10/mysql-tomcat/Dockerfile b/10/mysql-tomcat/Dockerfile index dac889c..b94362b 100644 --- a/10/mysql-tomcat/Dockerfile +++ b/10/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:8-jdk8-slim +FROM tomcat:8-jdk11-adoptopenjdk-hotspot # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/10/postgres-tomcat/Dockerfile b/10/postgres-tomcat/Dockerfile index a0c40f5..9714104 100644 --- a/10/postgres-tomcat/Dockerfile +++ b/10/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:8-jdk8-slim +FROM tomcat:8-jdk11-adoptopenjdk-hotspot # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/11/mysql-tomcat/Dockerfile b/11/mysql-tomcat/Dockerfile index a12ab99..a229ccf 100644 --- a/11/mysql-tomcat/Dockerfile +++ b/11/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:8-jdk8-slim +FROM tomcat:8-jdk11-adoptopenjdk-hotspot # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/11/postgres-tomcat/Dockerfile b/11/postgres-tomcat/Dockerfile index 0ea68ec..3994827 100644 --- a/11/postgres-tomcat/Dockerfile +++ b/11/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:8-jdk8-slim +FROM tomcat:8-jdk11-adoptopenjdk-hotspot # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/template/Dockerfile b/template/Dockerfile index 6179823..8964064 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:8-jdk8-slim +FROM tomcat:8-jdk11-adoptopenjdk-hotspot # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) -- GitLab