From 18342c6ad1e23ea3fa3efb4ad883007ecdbaa790 Mon Sep 17 00:00:00 2001 From: Vincent Massol <vincent@massol.net> Date: Mon, 11 Jul 2022 16:14:50 +0200 Subject: [PATCH] XDOCKER-241: Tomcat 9-jre11 base image move to eclipse-temurin makes XWiki image unusable --- 13/mariadb-tomcat/Dockerfile | 2 +- 13/mysql-tomcat/Dockerfile | 2 +- 13/postgres-tomcat/Dockerfile | 2 +- 14/mariadb-tomcat/Dockerfile | 2 +- 14/mysql-tomcat/Dockerfile | 2 +- 14/postgres-tomcat/Dockerfile | 2 +- template/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/13/mariadb-tomcat/Dockerfile b/13/mariadb-tomcat/Dockerfile index ab97fc8..3d0d28f 100644 --- a/13/mariadb-tomcat/Dockerfile +++ b/13/mariadb-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-jre11 +FROM tomcat:9-jre11-openjdk # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/13/mysql-tomcat/Dockerfile b/13/mysql-tomcat/Dockerfile index 1dbab21..062e022 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-jre11 +FROM tomcat:9-jre11-openjdk # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/13/postgres-tomcat/Dockerfile b/13/postgres-tomcat/Dockerfile index 1f6960c..a69f5dd 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-jre11 +FROM tomcat:9-jre11-openjdk # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/14/mariadb-tomcat/Dockerfile b/14/mariadb-tomcat/Dockerfile index 1e9b365..8819d7e 100644 --- a/14/mariadb-tomcat/Dockerfile +++ b/14/mariadb-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-jre11 +FROM tomcat:9-jre11-openjdk # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/14/mysql-tomcat/Dockerfile b/14/mysql-tomcat/Dockerfile index 12ee7d3..948252c 100644 --- a/14/mysql-tomcat/Dockerfile +++ b/14/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-jre11 +FROM tomcat:9-jre11-openjdk # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/14/postgres-tomcat/Dockerfile b/14/postgres-tomcat/Dockerfile index 1bef796..4e23cb6 100644 --- a/14/postgres-tomcat/Dockerfile +++ b/14/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-jre11 +FROM tomcat:9-jre11-openjdk # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) diff --git a/template/Dockerfile b/template/Dockerfile index ca4a1e1..fb5189a 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-jre11 +FROM tomcat:9-jre11-openjdk # ____ ____ ____ ____ _ __ _ # |_ _||_ _||_ _| |_ _|(_) [ | _ (_) -- GitLab